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 23:23:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
6432 commits 8 branches 109 tags 27 MiB
Commit graph

352 commits

Author SHA1 Message Date
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
dependabot[bot]
dc73ace7c4
Bump pytest from 7.4.0 to 7.4.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.0 to 7.4.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.4.0...7.4.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-09-09 15:07:06 +00:00
dependabot[bot]
a229a623bb
Bump tox from 4.11.1 to 4.11.3 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.11.1 to 4.11.3.
- [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.11.1...4.11.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-09 10:05:32 +00:00
dependabot[bot]
ff2c2290c7
Bump tox from 4.10.0 to 4.11.1 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.10.0 to 4.11.1.
- [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.10.0...4.11.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-02 10:27:10 +00:00
dependabot[bot]
e65b171aea
Bump tox from 4.9.0 to 4.10.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.9.0 to 4.10.0.
- [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.9.0...4.10.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-26 11:24:09 +00:00
dependabot[bot]
1afc96c055
Bump pytest-testinfra from 8.1.0 to 9.0.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 8.1.0 to 9.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/8.1.0...9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-26 10:46:28 +00:00
dependabot[bot]
43882693a5
Bump tox from 4.7.0 to 4.9.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.7.0 to 4.9.0.
- [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.7.0...4.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-19 10:19:26 +00:00
dependabot[bot]
bd55b2e566
Bump tox from 4.6.4 to 4.7.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.4 to 4.7.0.
- [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.6.4...4.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-12 10:25:00 +00:00
Adam Warner
e42c692ec7
Drop docker-compose from requirements.txt, it's not used. This was the only thing preventing us from using pyyaml 6.0.1 which fixes issues we were seeing with tests not running (https://github.com/yaml/pyyaml/pull/702) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-18 08:04:33 +01:00
dependabot[bot]
8dd8f989ab
Bump tox from 4.6.2 to 4.6.4 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.2 to 4.6.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.6.2...4.6.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-16 21:44:31 +00:00
dependabot[bot]
a3955a7ebb
Bump pytest from 7.3.2 to 7.4.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.2 to 7.4.0.
- [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.3.2...7.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-16 21:36:15 +00:00
Adam Warner
04c3f7a603
Development -> development-v6 (#5321) 2023-06-18 22:21:11 +01: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
dependabot[bot]
7a66083e68
Bump tox from 4.6.0 to 4.6.2 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.0 to 4.6.2.
- [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.6.0...4.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-17 11:35:38 +00:00
dependabot[bot]
3fd7b4ee24
Bump pytest from 7.3.1 to 7.3.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.1 to 7.3.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.3.1...7.3.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-06-17 10:59:42 +00:00
Christian König
117c15319d
Add tests for Debian 12 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-10 23:03:43 +02:00
dependabot[bot]
8e481e27da
Bump tox from 4.5.2 to 4.6.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.5.2 to 4.6.0.
- [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.5.2...4.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-10 11:00:35 +00: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
dependabot[bot]
b0fa3795e9
Bump tox from 4.5.1 to 4.5.2 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.5.1 to 4.5.2.
- [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.5.1...4.5.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-03 10:58:23 +00:00
Christian König
ec82aec55f
centos_common_support.py was removed 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-02 00:13:57 +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
Christian König
001024b4da
Fix Tests No2 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-01 20:41:54 +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
DL6ER
350c9e02ea
Add Ubuntu 23 to test suite (#5284) 2023-05-28 07:39:34 +02:00
dependabot[bot]
3ae72114c7
Bump pytest-testinfra from 8.0.0 to 8.1.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/8.0.0...8.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-27 10:59:32 +00:00
Christian König
b5800ef718
Remove getFTLAPIPort() function and fix pihole status 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-27 11:53:00 +01:00
Adam Warner
6b1c8a7fff
@DL6ER changed the config key names... 
Remove superfluous test

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51: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
bf16fe4a37
Remove the EPEL related tests on centos/fedora - no longer neccasery 
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
Adam Warner
632aead691
add wrappers to utils.sh for setting FTL config & add tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Christian König
5bdb089b7f
Add Ubuntu 23 to test suite 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-24 22:54:47 +02:00
dependabot[bot]
10fe85933b
Bump pytest-testinfra from 7.0.0 to 8.0.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/7.0.0...8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-20 13:41:46 +00:00
dependabot[bot]
f9b29cfb62
Bump pytest-xdist from 3.3.0 to 3.3.1 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.3.0 to 3.3.1.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.3.0...v3.3.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-05-20 11:02:15 +00:00
dependabot[bot]
8d91ca874b
Bump pytest-xdist from 3.2.1 to 3.3.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.2.1 to 3.3.0.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.2.1...v3.3.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-05-13 11:01:21 +00:00
dependabot[bot]
83afff953f
Bump tox from 4.4.12 to 4.5.1 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.12 to 4.5.1.
- [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.12...4.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-29 10:57:31 +00:00
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