Commit Graph

96 Commits

Author SHA1 Message Date
DL6ER 96c6effa45 Only add "conf-dir=/etc/dnsmasq.d" to the config if this directory exists
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-15 12:33:32 +01:00
DL6ER 41ebe5ec51 !!! BREAKING CHANGE !!! Create new dnsmasq config file and test it.
This needs a manual removal of /etc/dnsmasq.d/01-pihole.conf and /etc/dnsmasq.d/02-pihole-dhcp.conf (if existing).
Furthermore, we need a new symlink /etc/pihole/01-pihole.conf -> /etc/dnsmasq.d/01-pihole.conf

Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-12 18:12:41 +01:00
DL6ER 8033c6c6bf Add new config items to the test TOML file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-09 20:34:54 +01:00
DL6ER 140a365806 Tests: Set api.pwhash and dns.blocking.mode using PATCH /api/config
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-08 21:29:55 +01:00
DL6ER 32279e0765 Also rename config options in test pihole-FTL.toml
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-01-02 20:08:45 +01:00
DL6ER 840e73ec4c Resolve missed merge conflict on Github workflow
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-30 16:17:08 +01:00
DL6ER a9ea62a3fc Merge branch 'development' into new/http
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-30 15:12:14 +01:00
DL6ER 6b6c069b22 Remove downloading step of inspect.lua from the testing suite - the script is now embedded into FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-20 12:57:46 +01:00
DL6ER 80b1d3edba Run tests for all x86_* architectures
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-13 18:20:27 +01:00
Christian König 597e98e773 Don't create FTL.port
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-21 12:06:14 +02:00
DL6ER 15942b17ce Store domainlist IDs for blocked/permitted queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-08-19 19:44:11 +02:00
DL6ER 20ba471ccd pihole-FTL.log was renamed to FTL.log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-17 12:20:28 +02:00
DL6ER dcc2e5d5a3 Change default log file path to /var/log/pihole/FTL.log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-03 18:36:39 +02:00
DL6ER 26ccee3f4c Merge branch 'development' into new/http
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-29 11:12:59 +02:00
Christian König 9b452f54fe logs from /var/log/ -> /var/log/pihole/
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-12 22:06:05 +02:00
DL6ER 279a300f2d Merge pull request #1289 from pi-hole/tweak/build-scripts
Tidy Up CI scripts - untangle from variables named after CircleCI
2022-01-23 17:11:09 +01:00
Adam Warner c0cf8de918 Rename CI variables to remove CIRCLE references, as we no longer use Circle CI. Also remove circle config.
Tweak build script to accept a `test` argument, and also to accept the existing arguments at any position

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-23 15:04:20 +00:00
DL6ER fd2a633d20 Use FTLs embedded SQLite3 engine for the tests instead of relying whatever the system may be providing
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-01-18 15:37:42 +01:00
DL6ER c0570c51c2 Merge branch 'development' into new/http
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-11-02 09:53:13 +01:00
Petr Menšík 5715fe5bce Allow use of system bats
Checkout latest version of bats only if BATS is not set already. Allow
using custom path, system bats instance for example.

Signed-off-by: Petr Menšík <pemensik@redhat.com>
2021-10-20 14:36:35 +02:00
Adam Warner f7f349b9e0 Split workflow up into distinct jobs, each depending on the previous part
1 - Define some outputs to be used by the other jobs
 2 - Build and Test x86_64/32 binaries - if not pull request, attach binaries to workflow run as artifacts
 3 - Build arm/aarch64 binaries - if not pull request, attach binaries to workflow run as artifacts
 4 - If not a pull request, download binaries from artifact store, and upload binaries via SSH. If it is a release, then attach binaries to release

Move from scp-action action to just running the plain sftp command
pdns-doc is now included in the build container so no need to add it in the test setup.

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-10-10 21:21:19 +01:00
DL6ER 02154d2023 Add powerDNS to the CI testing suite to serve zone ftl. locally
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-10-10 12:08:41 +02:00
DL6ER f8ba1e0094 Tests: Enable DNSSEC for query validation during the CI tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-02 21:57:30 +02:00
DL6ER 531bea9162 Tests: Use OpenDNS only for dig tests, use Google DNS for everything else.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-02 20:22:51 +02:00
DL6ER e3cd8ead5b Tests: We want extra logging enabled in pihole.log during the tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-02 18:01:46 +02:00
DL6ER bfc880d770 1.1.1.1 rejects ANY queries...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-31 22:26:08 +02:00
DL6ER 2a25bb0021 Tests: Use 1.1.1.1 as upstream as 8.8.8.8 SERVFAILs the HTTPS and SVCB tests domains
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-31 22:26:07 +02:00
DL6ER d967f23b54 Hard-code 8.8.8.8 as upstream server for the tests. It turned out to be more reliable as the CircleCI-provided DNS server tends to show a few timeouts on certain query types.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-31 22:26:07 +02:00
DL6ER 425e5fa009 Tests: DNS reply analysis test (using netmeister.org records)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-31 22:26:07 +02:00
DL6ER 7b2770e7f6 Merge branch 'release/v5.9' into new/http
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-07-13 17:04:16 +02:00
DL6ER db5c9470ba Also upload pihole.log on CI test fail
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-07-11 11:23:55 +02:00
DL6ER 56610126e7 Port more verbose DNSSEC logging to FTL' dnsmasq debug mode
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-06-16 22:20:57 +02:00
DL6ER 19806365c9 Tests: Include warnings and errors in the test result if we found them.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-06-11 10:07:39 +02:00
DL6ER 55bf825a81 Implement TOML config file reader/writer and a converter of the pre-v6.0 config file format.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-06-10 12:11:25 +02:00
DL6ER 67db8ac608 Upload HTTP and PH7 logs to Tricorder on errors in tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-01-08 12:15:13 +01:00
DL6ER ec4043aa9c Download and install LUA script during test runs
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-18 23:17:17 +01:00
DL6ER fd51a44e6f Upload FTL log to tricorder.pi-hole.net instead of printing directly into the container output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-09-21 21:07:03 +02:00
DL6ER 54f92dd16a Merge branch 'development' into new/mac_clients
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-08-11 06:53:58 +02:00
DL6ER 6a9f9bb3bf Undo PTR blocking warning
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-08-11 00:06:55 +02:00
DL6ER e201c8c98f Terminate running FTL instance (if any) before starting tests.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-08-10 23:53:32 +02:00
DL6ER d51224cb57 Mark get_regex_from_rowid as pure.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-08-10 23:25:49 +02:00
DL6ER 52af8e135b Merge branch 'release/v5.2' into new/mac_clients
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-07-29 12:21:12 +02:00
DL6ER 41b49782c2 Test: Check port file exists and contains the expected number (4711)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-07-17 10:16:45 +02:00
DL6ER 873bcf8cc3 Tests: Add tests for MAC address and interface name client selections.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-23 16:49:08 +02:00
MichaIng 0fd1e341da Use /run instead of /var/run for FTL runtime files
Compare with: https://github.com/pi-hole/pi-hole/pull/3248#issuecomment-620752054

Signed-off-by: MichaIng <micha@dietpi.com>
2020-05-01 12:41:33 +02:00
DL6ER b6d74c701c Fix two testing errors.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-18 22:13:07 +00:00
DL6ER d752539a6f Do not try to resolve client host names during the tests. This occasionally leads to false-negatives during the CI testing (the CI cannot always resolve the hostnames).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-18 10:01:12 +00:00
DL6ER b37de5ce1a Add test for reporting blocking status correctly to pihole.log file.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-24 12:18:58 +02:00
DL6ER 268312249a Run FTL in DEBUG_ALL mode to increase log verbosity during tests.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-19 18:18:34 +02:00
DL6ER 429a71dd56 Improve tests by testing only against our own testing domains instead of relying on the outcome of some formally randomly selected domains.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-09 21:45:29 +02:00