arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity
6,393 Commits 10 Branches 109 Tags 20 MiB
885895e994
Commit Graph

50 Commits

Author SHA1 Message Date
Adam Warner
df9c60e351
Reduce code duplication in FTL arch detect tests. 
Use parametrize to run the same test with different parameters for each arch we need to test.
Also include detection of unusupported in this test.
Create FTL_BRANCH constant to be used in functions (less places to remember to change it)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-01-08 18:26:59 +00:00
Adam Warner
220c0675ef
As we do in other tests, specify development-v6 branch of FTL is downloaded for the tests. We need to change this to develoment once v6 is released 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-01-07 21:03:48 +00:00
Christian König
54186a63ee Remove test for sudo file as well 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-09 21:04:56 +01:00
Christian König
159817b7e2
Use development-v6 as ftl branch for binary test 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-06 20:35:26 +01:00
DL6ER
38ecc1693f
Further simplify the ARMv6 test 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-21 20:39:32 +02:00
DL6ER
c571d8d37d
Drop support for ancient ARMv4 and ARMv5, the Debian binaries turn out to cause unresolvable SIGFPE on ARMv6 and lower. Fortunately, we can still use the Alpine binaries on all Raspberry Pi models (even the oldest ones) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-10-19 22:13:44 +02:00
Adam Warner
ca66c1ea9c
Switch to new branch name for FTL v6 development 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-18 22:05:18 +01:00
DL6ER
913be6c349
Print detected CPU arch 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-09 19:01:14 +02:00
DL6ER
9c27e4766d
Decide which FTL architecture to pick by by installed architectures rather than by detected processor (this may be wrong in an emulated Docker environment) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-08 22:17:14 +02:00
Christian König
366345e87e
Fix no_installs 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-04 20:31:48 +02:00
DL6ER
667418c71d
Use new FTL binary names 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-04 20:02:38 +02:00
Christian König
7da57c6acd
Don't check and install old FTL config file 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-02 00:08:50 +02:00
Christian König
0becc7615a
Run prestart 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-01 23:51:03 +02:00
Christian König
a4322c624f
Fix gravity in tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-01 22:00:40 +02:00
Adam Warner
792b0d419b
Test fixes 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-01 19:29:47 +01:00
Christian König
7351a4d3b1
Merge branch 'development' into development-v6 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-01 15:45:05 +02:00
Christian König
f7b9d70054
Remove man page for pihole-FTL 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-30 21:39:10 +02:00
Adam Warner
494734bf27
Add in a test case 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-28 23:48:16 +01:00
Adam Warner
7cbe713873
REVISIT: Don't rely on existence of setupVars.conf 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
0e8f285f4f
Always assume that the web interface will be installed. 
We could revist this again in future if we decide that there should still be a choice to install the interface or not

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
9bf372ef43
[REVISIT] Remove test_installPihole_fresh_install_readableBlockpage for now. We may be able to recylcle it later, but I have my doubts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
414df5b372
Remove no longer required checks in test_installPihole_fresh_install_readableFiles 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
5e431210fd
[REVISIT] Remove test_setupVars_saved_to_file for now - it may no longer be needed as we move towards getting rid of the file. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
8f7c828407
No need for test_installPiholeWeb_fresh_install_no_errors 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Christian König
d87cad76fb
Tweak get_directories_recursive 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-01-04 12:41:53 +01:00
Glenn Strauss
34f45d011d
lighttpd: do not install obsolete 404 handler 
(/var/www/html/pihole/ dir and contents are still removed in uninstall)
(/var/www/html/index.lighttpd.orig is still removed in uninstall)

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 17:53:20 -05:00
Glenn Strauss
c6342ed84c
lighttpd: do not overwrite /etc/lighttpd/lighttpd.conf 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 16:19:03 -05:00
Glenn Strauss
78f9e38425
lighttpd: test for /etc/lighttpd/conf*/pihole-admin.conf 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 02:34:53 -05:00
Christian König
ea26171c18
Do not require man pages to be present in test script 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-11-24 20:39:02 +01:00
MichaIng
5c090d25e1
Fix ldd sh mock in tests 
Since "command" is a shell internal, it cannot be mocked, done via /usr/local/bin override. Since Debian containers ship without /bin => /usr/bin symlink, while all other containers do, the "ldd" mock needs to be applied for both paths, then.

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-10-12 12:49:50 +02:00
a1346054
e5695f862f
test_any_automated_install.py: Use command -v instead of which 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2022-10-11 14:36:26 +00:00
Adam Warner
1b0b0ca445
Update python tests and add black code formatter action (#4926) 2022-09-26 20:00:27 +01:00
Christian König
17ec88d96f
Remove installed_binary variable which was leftover from https://github.com/pi-hole/pi-hole/pull/4893 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-19 14:50:35 +02:00
Christian König
0df38cd64e
Format all /test files with black 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-19 14:50:35 +02:00
yubiuser
2ff1fa1b85
Merge branch 'development' into use_utils 2022-09-17 16:14:31 +02:00
Adam Warner
0f74165c9d
Drop Ubuntu 18 tests 
Tweek version_check to only output 1st char of the reported version

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-03 12:55:17 +01:00
Adam Warner
46e1a87e9e
Tweak FTL test to ensure we don't get false positives on incompatible OS (Will remote Ub18 in a separate commit) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-03 12:09:37 +01:00
Christian König
9b5ea13a33 Use utils.sh in install script 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-24 08:49:20 +02:00
Adam Warner
5421aad03e
Store versions as key/value pairs rather than space delimeted values 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-22 19:11:27 +01:00
Adam Warner
5816f495f4
Fix test_installPiholeWeb_fresh_install_no_errors and test_installPihole_fresh_install_readableBlockpage 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-08 17:12:16 +01:00
Adam Warner
9028898ba7
Move code from check_epel_repo_required into the rpm branch of the if check on package_manager_detect(), adjust tests to accommodate 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-30 19:27:00 +01:00
Adam Warner
b613758419
rename select_rpm_php and simplify it to remove code no longer needed (discussed internally removing the unsupported dialog here to match behaviour on non rpm distros) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-30 16:27:31 +01:00
Dan Schaper
a650641da4 Change tests to mock dialog 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-07-03 11:08:56 -07:00
Adam Warner
0be987239e
Adds spellcheck action to the smoke-tests (also moves editorconfig-checker to smoketests away from it's own action) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-02 14:04:08 +01:00
Christian König
2c07d27ad7 Forgot two places 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-04 22:42:41 +02:00
Christian König
0fa94e0946
Remove unused test which was commented since 5 years by PR 1244 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-05-15 20:26:25 +02:00
Dan Schaper
c19788dd18
Mock which sh to reutrn /bin/sh. 
Check for `/bin/sh` library

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-20 11:22:58 -07:00
spmfox
2601162243 Changed ldd binary check from /bin/ls to /usr/bin/bash 
Signed-off-by: spmfox <spmfox@foxwd.com>
 2022-04-16 16:46:07 -04:00
Christian König
d7d8e9730b Remove pihole-FTL.conf.5 from automated tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-04 20:43:47 +01:00
Adam Warner
77e5121d43
Split new function out into a separte utility script and add a test for it. Can be used in future to organise re/commonly-used code 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-30 23:05:28 +00:00