arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 06:48:07 +00:00
Code Issues Releases Wiki Activity
4,547 Commits 9 Branches 109 Tags 20 MiB
2c461460db
Commit Graph

115 Commits

Author SHA1 Message Date
bcambl
2c461460db
test with both centos7 and centos8 images 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:36 +01:00
Adam Warner
5aab68ab41
Update test/test_automated_install.py 
Co-authored-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-23 22:20:36 +01:00
Adam Warner
c9edcfa335
add test to check "os_check" works 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 22:18:42 +01:00
Adam Warner
33e5735053
Change base images for test containers to latest supported version 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 22:18:42 +01:00
Adam Warner
de02bcc8a0
Merge pull request #3787 from pi-hole/verdantfire 
fixed small grammatical error
 2020-10-19 10:53:41 +01:00
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>
 2020-10-14 20:31:22 +02:00
verdantfire
b88efd2527
fixed small grammatical error 
Co-authored-by: Himanshu Ruhela <himanshuruhela013@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-09 13:46:25 +01:00
Adam Warner
9e96ff37de
Fix merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 22:16:43 +01:00
Adam Warner
a37dba2c81
remove configureFirewall function, the call to it, and related tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-19 14:52:01 +01:00
pvogt09
25c5661c1b fix stickler errors 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-04-03 19:22:30 +02:00
pvogt09
a993b8b34d fixes #3217 by checking for existing pihole group 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-04-03 13:18:32 +02:00
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>
 2020-03-08 16:53:14 -07:00
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>
 2020-03-02 23:30:44 -08:00
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>
 2019-11-15 19:49:09 +00:00
bcambl
cf2b021502 linting: E302 expected 2 blank lines, found 1 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-10-14 13:29:43 -06:00
bcambl
cd9b1fcb8c update tests for SELinux changes 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-10-14 13:02:44 -06:00
Adam Warner
9a6deb5a1a
Fix tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-17 21:16:49 +01:00
Mcat12
1d5755a4c2
Add tests for valid_ip 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-10 21:18:58 -07:00
bcambl
218476fab0 ensure installation dependencies for FTL tests which rely on /etc/init.d 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-07-06 11:06:08 -06:00
bcambl
c48b03584f update Fedora Dockerfile to 30 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-07-06 10:57:57 -06:00
Mcat12
d67122dffc
Pin the Fedora test docker container to 29 
The tests are currently failing due to a change in Fedora 30, which we
are not currently supporting.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-06-16 11:13:23 -07:00
pvogt09
efbd42f7b5 Moves creation of pihole user before FTL installation 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-12 11:27:25 +02:00
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>
 2019-01-31 20:00:26 +01:00
DL6ER
d26f2dcb2c
Use global binary variable in tests for automated install 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-24 09:47:28 +01:00
Mark Drobnak
1789a2db29
Merge pull request #2384 from pi-hole/feature/install-privacy-level 
Set FTL Privacy Level During Install
 2018-11-01 15:16:11 -04:00
bcambl
6f8e8e98bb update centos version check test 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-08-29 22:16:11 -06:00
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>
 2018-08-20 19:33:15 -04:00
DL6ER
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-07 16:51:58 +02:00
Adam Hill
b04195041a
Update README.md 2018-07-12 10:22:50 -05:00
Adam Hill
8ca4c66e3c
make smarter assertions rathe than largestring not in string 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-12 00:03:25 -05:00
Adam Hill
449b7bf6e4
reduce the amount of strict not in checks 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-11 23:25:16 -05:00
Adam Hill
88e4b6390c
Tox! 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-11 23:24:28 -05:00
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>
 2018-07-08 14:02:31 -06:00
bcambl
4c23964964 ensure images are build prior to running tests 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-07 18:43:11 -06:00
bcambl
d4addd53ad Add tests for Fedora/CentOS distro_check 
- test to ensure installer behavior with unsupported CentOS releases
- test to ensure repository enablement
- test to ensure PHP upgrade opt-in/opt-out behavior

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-07 17:44:05 -06:00
bcambl
09d40679c0 add test for unsupported distro checking 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-06 10:07:43 -06:00
bcambl
553aad6ed2 add Fedora container to test matrix 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-05 18:12:39 -06:00
bcambl
5ca2ad6148 move test globals & mock commands to conftest 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-05 18:10:43 -06:00
bcambl
40537e1522 python linting: missing whitespace after ',' (E231) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:43:24 -06:00
bcambl
064a75b21b python linting: missing whitespace around operator (E225) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:43:18 -06:00
bcambl
1d3445bc0f python linting: whitespace after '(' and before ')' (E201 & E202) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:43:09 -06:00
bcambl
79232d02c9 python linting: 'pytest' imported but unused (F401) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:30:00 -06:00
bcambl
9bd4986781 python linting: whitespace before ':' (E203) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:21:57 -06:00
bcambl
c3d443aaff python linting: lines > 79 characters (E501) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:09:56 -06:00
bcambl
da3dfd0998 python linting: missing whitespace after ':' (E231) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-02 15:25:51 -06:00
bcambl
4468d81472 python linting: 2 lines prior to defs (E302) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-02 14:54:19 -06:00
bcambl
9d3d33b6a2 add tests for selinux checking 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-06-26 00:09:30 -06:00
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>
 2018-03-06 18:44:57 +00:00
WaLLy3K
26afe04926 Remove index.js test 2017-09-19 01:04:04 +10:00
Adam Warner
42b5574f9b
remove no longer needed tests 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-09-09 19:41:05 +01:00