Adam Warner
5b03160295
Install script comment tweaks ( #4361 )
3 years ago
Christian König
466520366d
Fogot to save...
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
9dbcbdbe66
Adjust tests
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
yubiuser
1c286c7bc4
Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed ( #4325 )
...
* Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed
* Remove check for unsupported RPM distros as it is checked in os_check already
* Add select_rpm_php function to tox tests
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
d68a2ffaf3
Install only minimal requiered package before performing os_check
...
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Adam Warner
1358209a9a
rename distro_check to package_manager_detect, as it is more in keeping with what the function actually does
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist
3 years ago
Adam Warner
87f2ae82cd
Stickler gonna stickle...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Adam Warner
469b715442
Add three new tests (one for each dependecy array) to check packages are available in supported OS package repos
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
DL6ER
aa88be335e
Acknowledge that IPV{4,6}_ADDRESS may not exist
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
74948ae5c1
The correct port separator is '#' not ':' in dnsmasq style. This should not have been changed in #4083 in the first place.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
jbzdarkid
8090071eff
Update regex to disallow leading zeros
...
Also updated a comment to point to a non-experimental RFC.
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
3 years ago
Joseph Blackman
89c80947df
Improve regexes for ipv4 matching
...
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
3 years ago
Adam Warner
fb454ebe14
fix stickler complaints
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
ee556088b5
Fake OS details in /etc/os-release and confirm install fails
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
bcambl
a7c58e7112
E302 expected 2 blank lines, found 1
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
4 years ago
Adam Warner
5aab68ab41
Update test/test_automated_install.py
...
Co-authored-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
4 years ago
Adam Warner
c9edcfa335
add test to check "os_check" works
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
DL6ER
01c9bbd3ca
Improve processor detection to use the new dedicated ARMv4T, ARMv5TE and ARMv8-A binaries we provide for FTL.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
Adam Warner
9e96ff37de
Fix merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner
a37dba2c81
remove configureFirewall function, the call to it, and related tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
pvogt09
25c5661c1b
fix stickler errors
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
4 years ago
pvogt09
a993b8b34d
fixes #3217 by checking for existing pihole group
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
4 years ago
XhmikosR
7b8611ced0
Assorted typo fixes. ( #3126 )
...
* Assorted typo fixes.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
4 years ago
jnozsc
4a711340ef
use py3 instead py2 ( #3153 )
...
* use py3 instead py2
Signed-off-by: jnozsc <jnozsc@gmail.com>
* use python 3.6
Signed-off-by: jnozsc <jnozsc@gmail.com>
4 years ago
Adam Warner
12817c09bb
(Squashed commits)
...
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
no need for global variable
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Use a file in the temporary FTL download directory
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Local binary variable named to l_binary. Disambiguate from global binary.
Allow 'binary' to be shadowed for testing.
Use ./ftlbinary in all operations.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Revert shadow ability on binary variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Remove unused tests, binary variable can not be overridden.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This should work here, too
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
binary name is passed through from pihole checkout
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Add comments
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
OK, let's try it this way again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
we might be getting somewhere.. squash after this I think!
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
fix the rest of the tests
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Remove trailing whitespace in the files we've touched here
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
bcambl
cd9b1fcb8c
update tests for SELinux changes
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
Adam Warner
9a6deb5a1a
Fix tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
Mcat12
1d5755a4c2
Add tests for valid_ip
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
bcambl
218476fab0
ensure installation dependencies for FTL tests which rely on /etc/init.d
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
pvogt09
efbd42f7b5
Moves creation of pihole user before FTL installation
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
DL6ER
7479485d45
Add test for the case the binary variable is unset (defaults to "tbd" in this case)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
d26f2dcb2c
Use global binary variable in tests for automated install
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mcat12
c22e94c9c7
Update test to include empty FTL config
...
The installer ensures that an FTL config will exist, and creates an
empty file if it doesn't.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
DL6ER
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Adam Hill
8ca4c66e3c
make smarter assertions rathe than `largestring not in string`
...
Signed-off-by: Adam Hill <adam@diginc.us>
6 years ago
bcambl
fff31558a0
assert REMI repository is not installed for Fedora
...
- fix whiptail mock comments to clarify continue vs cancel
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
09d40679c0
add test for unsupported distro checking
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
5ca2ad6148
move test globals & mock commands to conftest
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
40537e1522
python linting: missing whitespace after ',' (E231)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
064a75b21b
python linting: missing whitespace around operator (E225)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
79232d02c9
python linting: 'pytest' imported but unused (F401)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
9bd4986781
python linting: whitespace before ':' (E203)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
c3d443aaff
python linting: lines > 79 characters (E501)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
da3dfd0998
python linting: missing whitespace after ':' (E231)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
4468d81472
python linting: 2 lines prior to defs (E302)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
9d3d33b6a2
add tests for selinux checking
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Adam Warner
8cf8da4c78
- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other
...
- Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq
- Add service_disable function
- Add dependency libcap2-bin on debian to enable setcap. Need to check other distos
-Always download FTL binary if /etc/pihole/ftlbranch does not contain "master"
- Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
WaLLy3K
26afe04926
Remove index.js test
7 years ago
Adam Warner
42b5574f9b
remove no longer needed tests
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago