Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 15:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
6443 commits 8 branches 109 tags 27 MiB
Commit graph

353 commits

Author SHA1 Message Date
Christian König
eed4b70512
Add Fedora 38 to the test suite 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-04-19 21:03:12 +02:00
dependabot[bot]
364fd38996
Bump pytest from 7.2.2 to 7.3.1 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.2 to 7.3.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.2...7.3.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-15 12:34:19 +00:00
dependabot[bot]
c36d0257ec
Bump tox from 4.4.7 to 4.4.12 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.7 to 4.4.12.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.4.7...4.4.12)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-15 10:57:39 +00:00
Adam Warner
58275ecd13
Revert "Ignore commented lines when reading PRIVACYLEVEL from config file" 2023-03-22 21:52:39 +00:00
Dan Schaper
fb032ea6e7
Ignore commented lines when reading PRIVACYLEVEL from config file (#5177) 2023-03-22 12:23:40 -07:00
Adam Warner
4d21bae669
Fix addKey to handle substrings of existing keys (#5211) 2023-03-21 12:31:01 +00:00
yubiuser
7ea0bbb85c
Bump tox from 4.4.6 to 4.4.7 in /test (#5215) 2023-03-18 13:58:43 +01:00
dependabot[bot]
686da5a948
Bump tox from 4.4.6 to 4.4.7 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.6 to 4.4.7.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.4.6...4.4.7)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-18 10:58:57 +00:00
dependabot[bot]
8a2829de87
Bump pytest-xdist from 3.2.0 to 3.2.1 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.2.0...v3.2.1)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-18 10:58:49 +00:00
William Blew
b9a6970bfd
Fix addKey to handle substrings of existing keys 
Fix addKey to handle the case where a key is being added, and that key
is the leading substring of an already existing key within that file.

For example: add "server=192.168.1.1", when "server=192.168.1.178"
already exists within the /etc/dnsmasq.d/01-pihole.conf file.

Check pihole docker with PIHOLE_DNS="192.168.1.178;192.168.1.1". Its
/etc/dnsmasq/01-pihole.conf will be missing its second server= entry.

Add the test_key_addition_substr, to test addKey when
its adding a substring key of an existing key in the file.

Signed-off-by: William Blew <william@kulian.org>
 2023-03-17 11:50:52 -07:00
dependabot[bot]
0b60601f86
Bump pytest from 7.2.1 to 7.2.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.1 to 7.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.1...7.2.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-04 10:57:42 +00:00
dependabot[bot]
31a9e18997
Bump tox from 4.4.5 to 4.4.6 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.5 to 4.4.6.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.4.5...4.4.6)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-25 10:57:18 +00:00
Christian König
4fd0f15d90
Ignore commented lines when reding PRIVACYLEVEL from config file 
Create dedicated getVal function in utils.sh as it might be useful somewhere else
Account for tailing comments and $key not being on the first line

Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-21 21:03:55 +01:00
Dan Schaper
2380359270
Bump pytest-xdist from 3.1.0 to 3.2.0 in /test (#5170) 2023-02-21 11:40:13 -08:00
Christian König
90da155053
Use buildx to create docker test images 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-16 21:43:30 +01:00
Christian König
4b503a080b
Revert "Use new worksteal distribution algorithm" 
This reverts commit 46fe37b4da.

Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-14 22:14:29 +01:00
Christian König
46fe37b4da
Use new worksteal distribution algorithm 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-14 21:12:12 +01:00
dependabot[bot]
d6275cdd7c
Bump pytest-xdist from 3.1.0 to 3.2.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-13 09:04:19 +00:00
dependabot[bot]
5ecdfb53c2
Bump tox from 4.4.4 to 4.4.5 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.4 to 4.4.5.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.4.4...4.4.5)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-11 10:57:20 +00:00
dependabot[bot]
e5ea361b53
Bump tox from 4.3.5 to 4.4.4 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.3.5 to 4.4.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.3.5...4.4.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-04 10:01:16 +00:00
dependabot[bot]
d6e25403ee
Bump tox from 4.2.8 to 4.3.5 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.2.8 to 4.3.5.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.8...4.3.5)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-21 10:01:41 +00:00
Christian König
afc8241c2c
Remove leftover Fedora 35 tox file 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-01-16 21:59:21 +01:00
Adam Warner
bb4698429f
Remove fed 35 from test suite 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-16 13:54:38 +00:00
dependabot[bot]
eb1f2ac01c
Bump pytest from 7.2.0 to 7.2.1 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.0...7.2.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-14 18:08:40 +00:00
dependabot[bot]
318ee3b7d3
Bump tox from 4.0.17 to 4.2.8 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.0.17 to 4.2.8.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.17...4.2.8)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-14 17:54:02 +00: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
Christian König
64d0621d2b
Update and set test suite python dependencies 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-26 12:15:16 +01:00
Adam Warner
ec1d4c5500
lighttpd: do not overwrite /etc/lighttpd/lighttpd.conf (On new installs) (#5075) 2022-12-19 23:36:23 +00: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
Adam Warner
9072a6a7f0
add Fedora 37 to distro-test in .github/workflows/test.yml (#5067) 2022-12-19 20:08:11 +00: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
c8e69c6139
Set testenv explicitly 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-18 14:41:18 +01:00
Christian König
da8893f477
Try bandaid 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-18 12:45:14 +01:00
Glenn Strauss
e7e7a817bb
add Fedora 37 to distro-test 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-17 04:18:38 -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
Adam Warner
6b8ba3c15e
Replace deprecated shell commands (#4907) 2022-11-14 17:52:31 +00:00
RD WebDesign
85ffbcf05e
Allow replacing conflicting existing packages from testing image 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-10-17 14:58:42 -03:00
RD WebDesign
528abc9c97
Adding CentOS Stream 9 tests 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-10-16 19:36:56 -03: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
Christian König
4265bcb178
Add initscripts to CentOS8 dockerfile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-08 22:08:39 +02:00
Dan Schaper
71b560667b
Add Fedora 35 and 36, remove 34 to/from the test suite (#4952) 2022-10-01 13:43:13 -07:00
Christian König
3731b65bd5
Remoce Fedora 34 from tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-01 10:04:26 +02:00
Christian König
6057b134ae
Add initscripts to Fedora 35 and 36 dockerfile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-01 10:03:13 +02:00
Christian König
a705fbca73
Add Fedora 35 and 36 to the test suite 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-29 19:13:23 +02:00
Christian König
276c480f50
Return default port if non-numeric characters are set in pihole-FTL.conf for FTLPORT. FTL does the same in such case and provide the API on 4711 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 23:40:09 +02:00
Christian König
3d01e4d0cf No detour - use pihole-FTL.conf to get the API port number 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 22:55:30 +02: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
Christian König
73ca4ebdbc
Update test requirements 
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
Christian König
8bc5b16527
Set tox envlist to py3 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-15 13:55:45 +02:00
Christian König
c1a927fff1
Run test workflows on python 3.10 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-15 13:55:45 +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
71bc237639
Merge pull request #4828 from pi-hole/centos7-can-do-one 
Drop explicit support for CentOS 7 from the install script
 2022-07-31 19:15:41 +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
fc2a564cc0
remove tests no longer needed 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-30 16:27:31 +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
Adam Warner
9c03915cb0
Remove special Centos7 hand holds. Move the unsupported dialog out to a further if block so that a user may still continue to install on centos7 (provided they have the pre-requisites installed) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-30 16:27:31 +01:00
Adam Warner
e29aa4e205
First things first... 2022-07-30 16:27:29 +01:00
Christian König
ab6b37bdcf
Fix stickler and codefactor complaints 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-26 19:33:38 +02:00
Christian König
c8c4eb59b7
Add getFTLPID() tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-26 17:34:42 +02:00
Christian König
2651abbe6c
Add tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-26 16:57:06 +02:00
Christian König
7b77d991df
Move FTL port and PID functions to utils.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-26 14:38:03 +02:00
Adam Warner
21af75a2d2
Ubuntu 21 tests are failing entirely. apt-update does not work on an impish vm, either 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-25 22:27:56 +01:00
Christian König
9f918972d2 Adjust tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-10 14:33:43 +02:00
Christian König
518cbd10e0
Rename also in docker files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-06 22:58:14 +02:00
Dan Schaper
0b10c50a0b
Merge branch 'development' into tweak/dialog 2022-07-03 11:58:45 -07:00
Dan Schaper
6efb3a3372
Fix for epel mirror timeouts 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-07-03 11:48:12 -07:00
Dan Schaper
2845c72bde Add testing dependencies for CentOS7 and dialog 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-07-03 11:08:56 -07: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
Dan Schaper
80bef5f6b6
Direct pull for epel-release 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-07-03 10:47:05 -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
f740e0fefb
Ubt22 is jammy not impish 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-25 23:11:16 +02:00
Christian König
8c498acd4c
Re-add Ubuntu21 tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-25 23:04:16 +02:00
Christian König
f9d1893f96
Update test to reflect currently supported OS 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-20 10:34:32 +02: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
Adam Warner
73aa43611f
Merge pull request #4700 from spmfox/4697-centos8-container-ftl-arch 
Changed ldd binary check for better compatibility
 2022-04-20 19:27:45 +01: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
Adam Warner
8de814ab34
Split the tests, too. Enhance the descriptions 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-19 18:35:56 +01: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
Adam Warner
db116971ce
I tried to do too many things in one function, vastly overcomplicating what should have been _this_ all along 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-14 22:53:38 +01:00
yubiuser
d3e94cbceb
Merge pull request #4653 from pi-hole/refactor-utils-redux 
Tweaks to functions in utils.sh and refactored usages in webpage.sh
 2022-04-04 23:25:54 +02:00
Adam Warner
4d31d5ee11
Address review comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-04 22:02:26 +01:00
Adam Warner
7fa8cdd03e
Address: 
- Review Comments
 - Stickler Complaints
 2022-04-02 12:46:07 +01:00
Dan Schaper
4230be0c80
Hirsute buildpack EOL upstream. Adding impish. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-01 12:00:14 -07:00
Adam Warner
48138d32b6
Adjust addOrEditKeyValPair to optionally take two or three arguments (adjust test to suit) 
Add a removeKey function with test

update webpage.sh to reference functions in utils.sh (this can likely be abstracted/refactored further)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-03-16 17:42:01 +00:00
Christian König
42424b515b Add getFTLAPIPort function 
Add ftl_api_port function

Signed-off-by: Christian König <ckoenig@posteo.de>

Use getFTLAPIPort in pihole

Signed-off-by: Christian König <ckoenig@posteo.de>

Use default portfile as fallback

Signed-off-by: Christian König <ckoenig@posteo.de>

Fix stickler

Signed-off-by: Christian König <ckoenig@posteo.de>

Correct variables

Signed-off-by: Christian König <ckoenig@posteo.de>

Apply suggestions from code review

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>

Add test getFTLAPIPort returing default port

Signed-off-by: Christian König <ckoenig@posteo.de>

Remove unused code from test_key_val_replacement_works

Signed-off-by: Christian König <ckoenig@posteo.de>

Add getFTLAPIPort_custom test

Signed-off-by: Christian König <ckoenig@posteo.de>

Fix output format

Signed-off-by: Christian König <ckoenig@posteo.de>

Add debugging

Signed-off-by: Christian König <ckoenig@posteo.de>

Remove debugging and fix function

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-27 18:16:53 +01: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
444526ad58
Switch from centos8 to centos8:stream base image for centos 8 tests 2022-02-03 18:43:19 +00: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
MichaIng
14a379d448
Fix generated /etc/os-release file in OS check test 
Signed-off-by: MichaIng <micha@dietpi.com>
 2021-11-30 02:57:44 +01:00
Adam Warner
cdd4d9ea9e
Update the tests (#4427) 
* unpin the requirements and update all to latest available - needs more work still. see notes in `def host()`

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* fix py3 monkey patch of testinfra docker using bash

Signed-off-by: Adam Hill <adam@diginc.us>

* update the other test files to use `host` instead of `Pihole`
Address some sticklr and codefactor
update python version from 3.7 to 3.8
preload `git` onto the centos/fedora test images, and switch which with command -v in the passthrough mock
testinfra is deprecated, use pytest-testinfra

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: Adam Hill <adam@diginc.us>
 2021-11-18 01:03:37 +00:00
pvogt09
cedd1a2591
unit test for umask problems in #3177 and #2730 (#3191) 
* add test for file permissions of $webroot

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* changes sudo to su for running command as user www-data

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* installs PIHOLE_WEB_DEPS to create LIGHTTPD_USER

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* changes stdout to rc

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* use installPihole instead of installPiholeWeb in test

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* try installation process with main

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* mock systemctl

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* removes stickler errors

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* start lighttpd and make webpage test optional

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* test all files and directories in $webroot

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* fix stickler and codefactor warnings

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* set permission for /var/cache if it did not exist before

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* add test case for pihole files

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* fix stickler errors

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* revert "set permission for /var/cache if it did not exist before" and make lighttpd start work

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* add --add-cap=NET_ADMIN to enable FTL start

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* specify DNS server for cURL

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* check files created by FTL

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* reorder code and change nameserver in /etc/resolv.conf

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* resolve with dig instead of relying on /etc/resolv.conf

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* set IP to 127.0.0.1 in setupVars.conf for blockpage tests

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* resolve domain with dig and remove debug output

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* fix stickler errors

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* no git pull in Github Action runs for pull requests

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* --cap-add=ALL test

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* fix stickler errors

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* remove debug code

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* update_repo patch for CentOS 7 in Github Actions

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* removes TODOs and stickler warnings

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* adds trailing slash to domain

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* use only first result from dig

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* domain name resolution does not work reliably in docker container

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* repair executable permission

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>

* Create mock_command_passthrough that allows intercepting of specific arguments - everything else is passed through to the proper command. Use this new command instead of making changes in basic-install.sh to make the tests pass.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2021-11-11 16:44:57 +00:00
Blayne Campbell
8713135b01
update tests: remove fedora 32, add fedora 34 (#4403) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-10-23 19:43:20 +01:00
Adam Warner
5b03160295
Install script comment tweaks (#4361) 2021-10-04 11:40:53 +01:00
Christian König
466520366d Fogot to save... 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-02 23:47:13 +02:00
Christian König
9dbcbdbe66 Adjust tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-02 23:43:08 +02:00
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>
 2021-09-12 13:40:37 -07:00
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>
 2021-08-05 19:02:36 +01:00
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>
 2021-08-05 19:02:36 +01:00
Adam Warner
38d4b2a883
add OS_CHECK_DOMAIN_NAME override to all the dockerfiles 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-14 22:41:17 +01:00
Adam Warner
e2e7d0a6aa
add tests for ubuntu 21 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-14 22:36:02 +01:00
Daniel
fdca19e66d Support and test Debian Bullsye (11) 
Signed-off-by: Daniel <daniel@developerdan.com>
 2021-07-07 19:09:54 +00:00
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist 2021-07-04 00:48:09 +01:00
Adam Warner
87f2ae82cd
Stickler gonna stickle... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 00:07:37 +01:00
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>
 2021-07-03 00:00:54 +01:00
DL6ER
60513f93a3
Don't set IPV{4,6}_ADDRESS in conftest.py 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-18 09:26:23 +02:00
DL6ER
aa88be335e
Acknowledge that IPV{4,6}_ADDRESS may not exist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-16 11:44:54 +02:00
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>
 2021-04-14 22:53:12 +02:00
bcambl
d5f13018a7 Merge branch 'release/v5.3' into fedora_33_support 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-04-12 20:06:11 -06:00
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>
 2021-03-21 16:27:08 -07:00
Joseph Blackman
89c80947df Improve regexes for ipv4 matching 
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-03-21 16:24:35 -07:00
bcambl
b62495d89e update tests to fedora 33 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2021-01-21 20:20:07 -06:00
Adam Warner
d1539335bc
appease stickler-ci 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-01 10:13:36 +00:00
Adam Warner
3e73782f0e
Remove Travis CI config 
Create Github Actions config
Split tox ini into one per supported distro so they can be run seperately

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-01 10:02:31 +00:00
Adam Warner
2a82e1fec1
Nothing to see here. I just forgot a page. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-18 23:29:08 +00:00
Adam Warner
f7982dfbe1
-remove duplicate OS dockerfiles 
+rename centos->centos_8, centos7 -> centos_7
+update centos/fedora test script

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-16 22:39:50 +00:00
pvogt09
b375dd2c81 Update test/ubuntu_20.Dockerfile 
Co-authored-by: Adam Warner <github@adamwarner.co.uk>
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-11-15 20:13:43 +01:00
pvogt09
4386cc4f22 Revert "add test case for installation of dependencies for installer, core and web" 
This reverts commit 60a4814ac1.

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 12:44:57 +01:00
pvogt09
cb49ce38f5 fix stickler errors 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 12:32:23 +01:00
pvogt09
3128d14d1f update images to versions supported by pi-hole 5 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 12:02:57 +01:00
pvogt09
bef9cd3bc2 mock whiptail to add universe repo 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 11:35:49 +01:00
pvogt09
60a4814ac1 add test case for installation of dependencies for installer, core and web 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 11:35:48 +01:00
pvogt09
fec1595183 add docker containers for debian 9 and 10, ubuntu 16 and 18, fedora 28 and 29 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-10-27 11:34:27 +01:00
Adam Warner
c80f0766c5
drop debian/fedora container versions to lowest supported 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-26 17:56:17 +00:00
Adam Warner
fb454ebe14
fix stickler complaints 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 23:09:07 +01:00
Adam Warner
ee556088b5
Fake OS details in /etc/os-release and confirm install fails 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-23 23:05:41 +01:00
bcambl
660c17814d
E128 continuation line under-indented for visual indent 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:37 +01:00
bcambl
a7c58e7112
E302 expected 2 blank lines, found 1 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:36 +01:00
bcambl
05b6717187
test PHP optin/optout separately for CentOS 7 & 8 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2020-10-23 22:20:36 +01:00
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