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-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
5674 commits 8 branches 109 tags 27 MiB
Commit graph

249 commits

Author SHA1 Message Date
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