ad108fee3f
Merge branch 'master' into dev
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-05-30 13:06:27 +01:00
3a76e3245f
Bump pytest from 8.2.0 to 8.2.1 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 8.2.0 to 8.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/8.2.0...8.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>
2024-05-25 10:29:53 +00:00
51f126108f
Bump pytest from 8.1.2 to 8.2.0 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 8.1.2 to 8.2.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/8.1.2...8.2.0 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-04 10:58:00 +00:00
6990b09aa5
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
...
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist ) from 3.5.0 to 3.6.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.5.0...v3.6.1 )
---
updated-dependencies:
- dependency-name: pytest-xdist
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-04 10:32:42 +00:00
94cb08a972
Bump black from 24.4.0 to 24.4.2 in /test
...
Bumps [black](https://github.com/psf/black ) from 24.4.0 to 24.4.2.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/24.4.0...24.4.2 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-27 10:50:34 +00:00
0d64bb5665
Bump pytest from 8.1.1 to 8.1.2 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 8.1.1 to 8.1.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/8.1.1...8.1.2 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-27 10:16:10 +00:00
2783e38030
Bump pytest from 8.0.2 to 8.1.1 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 8.0.2 to 8.1.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/8.0.2...8.1.1 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-18 18:54:26 +00:00
daf1e568bb
Bump the pip group across 1 directory with 3 updates
...
Bumps the pip group with 2 updates in the /test directory: [black](https://github.com/psf/black ) and [aiohttp](https://github.com/aio-libs/aiohttp ).
Updates `black` from 24.1.1 to 24.3.0
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/24.1.1...24.3.0 )
Updates `aiohttp` from 3.9.1 to 3.9.4
- [Release notes](https://github.com/aio-libs/aiohttp/releases )
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst )
- [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.1...v3.9.4 )
Updates `idna` from 3.6 to 3.7
- [Release notes](https://github.com/kjd/idna/releases )
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst )
- [Commits](https://github.com/kjd/idna/compare/v3.6...v3.7 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
dependency-group: pip
- dependency-name: aiohttp
dependency-type: indirect
dependency-group: pip
- dependency-name: idna
dependency-type: indirect
dependency-group: pip
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-18 15:45:21 +00:00
e5e6a2945b
Bump black from 24.2.0 to 24.4.0 in /test
...
Bumps [black](https://github.com/psf/black ) from 24.2.0 to 24.4.0.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/24.2.0...24.4.0 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-13 10:22:16 +00:00
146dc52b0b
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test
...
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra ) from 10.0.0 to 10.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/10.0.0...10.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>
2024-03-02 11:59:23 +00:00
23b3a42b78
Bump black from 24.1.1 to 24.2.0 in /test
...
Bumps [black](https://github.com/psf/black ) from 24.1.1 to 24.2.0.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/24.1.1...24.2.0 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-02 11:51:51 +00:00
02c93b362c
Bump pytest from 8.0.0 to 8.0.2 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 8.0.0 to 8.0.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/8.0.0...8.0.2 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-02 10:11:52 +00:00
e2035c184f
Bump pytest from 7.4.4 to 8.0.0 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4.4 to 8.0.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.4.4...8.0.0 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-03 11:46:12 +00:00
9601db6be2
Bump black from 24.1.0 to 24.1.1 in /test
...
Bumps [black](https://github.com/psf/black ) from 24.1.0 to 24.1.1.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/24.1.0...24.1.1 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-03 10:58:30 +00:00
119ae7331e
Bump black from 23.12.1 to 24.1.0 in /test
...
Bumps [black](https://github.com/psf/black ) from 23.12.1 to 24.1.0.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/23.12.1...24.1.0 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-27 10:57:08 +00:00
e4a6a8c9c5
Bump pytest from 7.4.3 to 7.4.4 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4.3 to 7.4.4.
- [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.3...7.4.4 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-06 10:31:36 +00:00
f400befb85
Merge pull request #1500 from ADawidowski/enhance_webtheme_validation
...
Enhance theme validation
2023-12-23 12:30:44 +00:00
cac2ac4292
Bump black from 23.12.0 to 23.12.1 in /test
...
Bumps [black](https://github.com/psf/black ) from 23.12.0 to 23.12.1.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/23.12.0...23.12.1 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-12-23 10:33:15 +00:00
fff38bda3b
Bump black from 23.11.0 to 23.12.0 in /test
...
Bumps [black](https://github.com/psf/black ) from 23.11.0 to 23.12.0.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/23.11.0...23.12.0 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-12-16 10:10:05 +00:00
5dc25ed425
Enhance theme validation
...
Makes the validation dynamic based on the existing theme css file names and
applies a regexp sanity check just to be sure.
Signed-off-by: Adam Dawidowski <drake@oomkill.net>
2023-12-10 22:31:15 +01:00
64f0e48fd9
Bump pytest-xdist from 3.4.0 to 3.5.0 in /test
...
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist ) from 3.4.0 to 3.5.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.4.0...v3.5.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-11-25 10:39:56 +00:00
a5dbe60fd6
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test
...
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist ) from 3.3.1 to 3.4.0.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.3.1...v3.4.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-11-18 10:55:23 +00:00
2a7181b2c0
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test
...
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra ) from 9.0.0 to 10.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/9.0.0...10.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-11-18 10:18:43 +00:00
12ee613e66
Bump black from 23.10.1 to 23.11.0 in /test
...
Bumps [black](https://github.com/psf/black ) from 23.10.1 to 23.11.0.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/23.10.1...23.11.0 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-11 10:30:10 +00:00
e083f8d16d
Bump pytest-testinfra from 6.8.0 to 9.0.0 in /test
...
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra ) from 6.8.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/6.8.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-11-03 14:23:04 +00:00
4dba66defd
Bump pytest-xdist from 2.5.0 to 3.3.1 in /test
...
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist ) from 2.5.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/v2.5.0...v3.3.1 )
---
updated-dependencies:
- dependency-name: pytest-xdist
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-03 14:19:39 +00:00
784ec0f055
Bump black from 22.8.0 to 23.10.1 in /test
...
Bumps [black](https://github.com/psf/black ) from 22.8.0 to 23.10.1.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/22.8.0...23.10.1 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-03 14:16:12 +00:00
0872f10821
Address SonarCloud Code Analysis
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-01 14:03:21 +01:00
7429594ecb
Upgrade to bookworm-slim
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-01 00:26:58 +01:00
4366cf6651
Bump pytest from 7.1.3 to 7.4.3 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.1.3 to 7.4.3.
- [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.1.3...7.4.3 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 21:15:01 +00:00
b4a60de22d
Only allow https for curl
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-15 13:23:58 +02:00
54d179c24b
Bind lighttpd to $WEB_BIND_ADDR by default.
...
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
2023-01-21 18:06:05 -08:00
8872c2b393
Fix config filename on the test
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-15 17:50:28 -03:00
b723874623
Don't need to see all the images on the system
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-06 18:57:09 +00:00
4da66313f4
Remove old test dependencies, updated ones still being used. Introduce Black formatter
2022-09-17 04:28:01 +00:00
97f81bae21
Shuffle some files around, change dependencies to make output clearer, change ::: for [i] to further clarify output.
...
Allow for PH_VERBOSE to set -x on all scripts that it would be useful for
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 13:17:22 +01:00
473117e8a8
Rename start and gravity scripts to match their service names
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:50:19 +01:00
e6d4c3091f
Move all scripts to /usr/local/bin to simplify dockerfile
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:48:07 +01:00
cbd86caa5b
Merge pull request #1170 from pi-hole/dependabot/pip/urllib3-1.26.5
...
Bump urllib3 from 1.25.9 to 1.26.5
2022-08-25 21:50:26 +01:00
cb38190b50
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 21:42:29 +01:00
33966f8eb2
Bump urllib3 from 1.25.9 to 1.26.5
...
Bumps [urllib3](https://github.com/urllib3/urllib3 ) from 1.25.9 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases )
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst )
- [Commits](https://github.com/urllib3/urllib3/compare/1.25.9...1.26.5 )
---
updated-dependencies:
- dependency-name: urllib3
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-08-21 19:32:22 +00:00
e75e3800a2
make sure that setup_FTL_ProcessDNSSettings is the last thing called, else user set environment variables will be overridden when it sources setupVars.conf
...
Some additional tweaks
2022-07-19 18:22:49 +01:00
1d59f257ff
Reorganise the repository
...
Simplify the test suite now that we use buildx to build the final image
Remove tests that were never run/skipped in previous runs (same number of tests passing as were before)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-15 17:43:09 +01:00
611df9b3f0
Huge tidy up/prune/refactor of the code
...
- Moves most code in start.sh into functions in bash_functions.sh
- Removes code from 20-start.sh and moves it inside start.sh
- Removes unused variables and code, making it easier to find our way around
- Removes dependency on webpage.sh, which had to be modified in order to source it properly (thus breaking pihole checkout), use utils.sh instead
- Replaces all uses of ServerIP/v6 with new FTLCONF_REPLY_ADDR4/6 variables
- No need to symlink echo to whiptail any more (probably hasn't been needed for a while)
- removes huge list of exported env vars at the top of start.sh - no longer appear to be needed
- rename some functions in bash_functions to more logical names, group their usages in start.sh
- adjust/fix tests to match changes
- remove some dead tests
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-11 23:50:05 +01:00
f17898bf6f
Also account for /var/log/lighttpd file name changes
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-12 13:37:39 +01:00
cb16942096
Address Sonar rules S125 ( https://rules.sonarsource.com/python/RSPEC-125 ) and S1481 ( https://rules.sonarsource.com/python/RSPEC-1481 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 22:04:44 +01:00
29f81fcfbc
Address Sonar rule S1192 ( https://rules.sonarsource.com/python/RSPEC-1192 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 21:58:09 +01:00
b3717000ae
Address Sonar rules S117 ( https://rules.sonarsource.com/python/RSPEC-117 ) and S1542( https://rules.sonarsource.com/python/RSPEC-1542 ) in all test .py files
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 21:26:47 +01:00
64e449c133
fix [this code smell]( https://sonarcloud.io/project/issues?pullRequest=1106&issues=AYE6byrIbM3H9G6ifn9K&open=AYE6byrIbM3H9G6ifn9K&id=pi-hole_docker-pi-hole )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 20:26:26 +01:00
6b9a4e6216
Fix up tests to work with new logic
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-06 20:14:26 +01:00
Adam Warner
dependabot[bot]
Adam Dawidowski
Christian König
Nathan Gaberel
RD WebDesign
Daniel