Commit Graph

385 Commits

Author SHA1 Message Date
DL6ER 3e2ef282f8
Merge pull request #713 from pi-hole/new/NAPTR
Add support for Name Authority Pointer (NAPTR) resource record
2020-03-17 23:07:37 +00:00
DL6ER 1af474819c
Update tests to use gravity domain count stored in test database.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-03 08:43:06 +01:00
DL6ER abf0e4cdec
Adjust tests after the last bugfix, bring gravity.db.sql schema to version 9.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-30 20:54:11 +00:00
DL6ER b6d74c701c
Fix two testing errors.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-18 22:13:07 +00:00
DL6ER bb9f25cb85
Merge pull request #664 from pi-hole/new/group_zero
Add group zero support
2019-12-18 22:36:46 +01: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 80584788ad
Add new zero-group-specific tests (domain associated ONLY to a particular query is only seen by this client).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12 17:51:44 +00:00
DL6ER 5637d132bf
Update FTL gravity.db.sql template to gravity database version 7.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12 17:42:26 +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 685d4a7c5b
Add tests for a third client that is member of an empty group. This client bypasses Pi-hole entirely as no adlists, exact or regex blacklists are enabled for it.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-19 18:55:41 +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 382e8dd43b
Tests: add third client that does not block anything (tagged with an empty group)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-19 16:00:02 +02:00
DL6ER fe0ec848d4
Add per-client tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-18 20:53:51 +02:00
DL6ER 609e09ad5f
Merge branch 'development' into new/internal-blocking
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-10 21:15:20 +02:00
DL6ER 06c885a150
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 22:07:15 +02:00
DL6ER c19067b6a3
Update gravity.db.sql to version 4
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-09 21:46:23 +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
DL6ER 62af161473
Tests: Do not rely on the non-existance of regexa.com
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-05 21:18:08 +02:00
DL6ER ad94faf196
Adjust tests now that we have one IP reply more.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-05 21:16:55 +02:00
DL6ER 0d450d9f31
We store the domains converted to lowercase so we should compare case-insensitive if we look for exact matches later.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-05 21:16:55 +02:00
DL6ER ca37be09a0
Adjust tests now that we have one IP reply more.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-04 20:40:02 +02:00
DL6ER b93d6ee13b
We store the domains converted to lowercase so we should compare case-insensitive if we look for exact matches later.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-04 20:35:11 +02:00
DL6ER 97aad2fd17
Undo testing for blacklisted.com in the Top Domains.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-04 19:33:28 +02:00
DL6ER 2b5e778dd4
Display number of domain in gravity table as number of blocked domains in the API.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-04 18:57:52 +02:00
DL6ER b17d0579ad
Ensure whitelist (exact + regex) has higher importance than gravity and blacklist.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-04 18:45:55 +02:00
DL6ER f3e8d23baf
Merge branch 'development' into new/whitelist-regex-support
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-17 15:01:32 +02:00
DL6ER 5b4d88867f
Merge branch 'development' into tweak/bbusy_timeouts
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-21 21:52:58 +02:00
DL6ER b21b551a52
Add busy timeout for database connections.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-21 21:43:03 +02:00
DL6ER be1b573a2a
Rename regex blacklist trigger to tr_regex_blacklist_update.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-16 11:36:00 +02:00
DL6ER 8431914084
Add tests for: Reported architecture, reported build machine, and reported compiler (+version). The tests are adaptive and can test both the situation found on the CI as well as locally.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-15 17:17:56 +02:00
DL6ER d362a5eb27
Merge branch 'development' into new/whitelist-regex-support
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-14 22:50:53 +02:00
DL6ER 95be30dd83
Add test "Regex blacklist match + whitelist regex match is not blocked".
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-09 15:49:15 +02:00
DL6ER 43a2c9fc82
Adjust expected statistics as we query additional domains now.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-09 15:25:22 +02:00
DL6ER ea6cddb76e
Added 8 new tests ensuring both whitelist exact and regex unblock regex as well as gravity domains as expected.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-09 12:27:24 +02:00
DL6ER c0eedd59db
Rename table regex to regex_blacklist.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-08 21:12:43 +02:00
DL6ER b0838aaffa
Temporarily disable regex debugging as it generated hundreds of thousands of messages during gravity import.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-07 22:59:51 +02:00
DL6ER d79891daaf
New table is called regex_whitelist (at least for now).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-07 22:52:23 +02:00
DL6ER fdff462fa4
Add support for regex filters for whitelisting.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-07 22:46:28 +02:00
DL6ER 8e0016e0bd
Audit table has been renamed to domain_audit.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-07 21:24:47 +02:00
DL6ER 0c13693c57
Add test for domain auditing.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-06 10:10:05 +02:00
DL6ER c944705d52
Table auditlist has been renamed to domain_auditlist.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-06 09:34:50 +02:00
DL6ER 30357a5e5d
Audit table name should be 'auditlog'
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 17:11:04 +02:00
DL6ER ec595e5b32
Fix incorrect INSERT statement in gravity.db test data.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 16:44:51 +02:00
DL6ER 9f127e9838
Fix incorrect INSERT statement in gravity.db test data.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 16:44:35 +02:00
DL6ER 67b5ec4f6b
Add audit table to gravity.db schema
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 16:14:55 +02:00
Mark Drobnak eba1dcf6f4
Merge pull request #598 from pi-hole/tests/static_binary
Tests: Dependence on shared libraries and a specific interpreter
2019-07-04 18:11:22 -04:00
Mark Drobnak ef04fb3e00
Merge pull request #602 from pi-hole/tests/new/gravity.db_domain_groups
Implement changes due to core/#2803
2019-07-04 16:53:09 -04:00
DL6ER 62edeb2a5a
Add a blacklisted domain that is disabled through a group association.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-04 22:19:56 +02:00
DL6ER a7f3f424aa
Update gravity.db.sql to reflect the state of the merged core PR
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-04 22:08:25 +02:00
DL6ER 0d4f08dbd3
Clarify test description
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-04 16:14:10 +02:00
DL6ER 70de007f38
Don't insert version twice
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-27 18:53:28 +02:00
DL6ER 0a4c52ca36
Add group ID to adlists test data
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-27 18:49:15 +02:00
DL6ER a8d9890312
Add group ID to test data
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-27 18:48:33 +02:00
DL6ER 18ee6cbd87
Readd test data
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-27 18:45:42 +02:00
DL6ER 1fba041f94
Implement changes due to https://github.com/pi-hole/pi-hole/pull/2803
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-27 18:35:16 +02:00
DL6ER a44d594032
Merge branch 'development' into new/networktable_ip_neigh 2019-06-25 19:58:31 +02:00
DL6ER 0afc57fd15
Add detailed test description
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-24 17:06:58 +02:00
DL6ER ef01d67733
Quote environment variable name
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-19 17:49:25 +02:00
DL6ER 03c86f1074
Add tests for dependence on shared libraries and a specific interpreter.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-19 17:48:07 +02:00
DL6ER 725bfd240d
Use ?* as wildcard to match one or more characters. This accepts and IP address or hostname but rejects an empty response.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-19 15:03:55 +02:00
DL6ER 977f58b2df
Do not expect the local IP to be 127.0.0.1 (it could also be, e.g., 127.1.2.3). Change all tests to just expect something being printed here, may it be an IP address or even a hostname.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-19 14:52:58 +02:00
DL6ER 9ae9598912
Add comments into test suite.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-17 23:31:26 +02:00
DL6ER 1aee636815
Generalize tests to pass if FTL is able to resolve localhost
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-17 22:13:32 +02:00
DL6ER b3fa8256f9
Also run tests using the 32 bit binary
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-17 21:21:40 +02:00
DL6ER d38faa6059
Add test commands (commented) to Dockerfile
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-17 20:45:11 +02:00
DL6ER b3398f5a9d
We should not assume a particular ordering on domains when the have been queried equally often + add busybox ls output as alternative solution for the permissions test.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-17 20:07:12 +02:00
DL6ER ab7721b11a
Generalize tests so they can be run both in the Alpine-based x86_64-musl and in the Debian-based x86_64 containers.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-17 19:56:24 +02:00
DL6ER c922835b72
Tests: Change schema of network table
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-16 21:18:23 +02:00
DL6ER 5f44b5b7bb
Tests: Added default value for lastSeen column in network_addresses table.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-16 12:21:23 +02:00
DL6ER 46ed609203
Tests: ALTER TABLE ... RENAME TO ... created a table using CREATE TABLE IS NOT EXISTS.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-16 11:06:12 +02:00
DL6ER 32185d9e49
Merge branch 'development' into new/networktable_ip_neigh 2019-06-16 10:14:36 +02:00
Mcat12 4345f12636
Merge branch 'development' into fix/pihole-FTL.db_mode 2019-06-15 20:52:19 -07:00
DL6ER 634f97a6fb
Update tests after having changed table schema
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 10:06:19 +02:00
DL6ER 7c7c47507c
Create PID and PORT files. The tests failed due to FTL warning not being able to create these files.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 07:53:59 +02:00
DL6ER 1115a57cfb
Change database owner to pihole:pihole in the tests.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 07:50:15 +02:00
DL6ER 2e7bd3e72d
Merge branch 'development' into fix/pihole-FTL.db_mode
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 07:49:38 +02:00
DL6ER 9c6a3199d7
Remove exception for running as root warning.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 07:47:51 +02:00
DL6ER 0c6603eeb4
Merge branch 'development' into tests/no_WARNING_ERROR 2019-06-15 07:47:15 +02:00
DL6ER 945734173a
Add test for successful creation of network_addresses table.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-14 19:56:24 +02:00
DL6ER efd3ce8a1c
Explicitly specify shell in runuser command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-12 21:24:44 +02:00
DL6ER 0ef1ef6193
Set shell of user pihole to nologin
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-12 21:16:05 +02:00
DL6ER 6bea624014
Fix matching single-quote
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-10 11:05:53 +02:00
DL6ER 66544bbe72
Explicitly search for : to avoid being triggered by the branch name
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-10 11:01:55 +02:00
DL6ER fc9f0a8854
Also ignore "Starting pihole-FTL as user root is not recommended" warning
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-10 11:00:50 +02:00
DL6ER e261c4fc22
Test against WARNING and ERROR messages in tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-10 10:55:23 +02:00
DL6ER 62153dbbf7
Tests are currently running as user root, will be addressed in a separate PR
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-10 10:37:37 +02:00
DL6ER 2e8e6b0c91
Run tests as user pihole
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-10 10:35:52 +02:00
DL6ER 420f58a79b
Add test for ownership and permissions of pihole-FTL.db given a restrictive umask on the testing system
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-10 09:56:14 +02:00
DL6ER 3d44cde9ed
Do not try to load the extension we removed
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 21:08:23 +02:00
DL6ER 80093c9ebf
Remove unused repo and update bats repo URL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 21:03:24 +02:00
DL6ER a3d75b3239
Use bats extension for test suite
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 21:02:14 +02:00
DL6ER 860c426cb2
Use sql extension for templte file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 21:01:03 +02:00
DL6ER e1286fe24c
Use generic not arch-dependent binary name
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 18:51:32 +02:00
DL6ER ae86c984a6
Removed bats submodules
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 18:35:10 +02:00
DL6ER 76fc40777e
The variable CI is set to "true" on the CI system. Explicitly test against this string.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 10:25:08 +02:00
DL6ER f5d77dcf44
Create gravity.db from provided test data
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 10:08:14 +02:00
DL6ER 1821522dbe
Use passed binary name for test and skip tests only if running on CI and binary name is not x86_64
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-08 10:05:45 +02:00
DL6ER dbe61c06da
Also test against one domain from the gravity table
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 21:59:43 +02:00
DL6ER e1c79f502c
Query two well known domains that are not blocked
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 21:37:51 +02:00
DL6ER e915559056
Adjust numbers to new test scenario
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 21:10:11 +02:00
DL6ER b6631c2fd1
Revive test suite
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 20:58:18 +02:00
DL6ER e4f686b6e3
Prepare pihole-FTL.conf
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 19:41:48 +02:00
DL6ER efd774f13a
Download prepared gravity database for using during tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 19:37:32 +02:00
DL6ER cf3ec632dc
Bind to port 53
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 18:47:50 +02:00
DL6ER 7c0d828bb0
Print version of pihole-FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 18:45:24 +02:00
DL6ER cf328c0af4
Reimplement tests for CricleCI, step 1: Start pihole-FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-07 18:27:32 +02:00
DL6ER ce10699fb3
Use new customizable paths for Travis' tests. Fallback to searching for a local pihole-FTL.conf if none was found in the default locations
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-07 17:04:19 +01:00
Mcat12 d2d24acfdf
Kill the >kill command
FTL now hosts the DNS server for the network, so allowing anyone to kill
it is a security issue.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-10-04 15:54:38 -04:00
DL6ER 9315a252fd
Merge pull request #224 from pi-hole/new/DB_integrated_counters
Create new table "counters" and store integrated counters therein
2018-03-02 20:52:22 +01:00
DL6ER 2e79e5895f
Add test that no "FATAL" lines have been found in the log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-17 13:24:31 +01:00
DL6ER d48f3bb178
Update tests to expect the new table "counters" and version 2 of the database. Also check if the time stamp index was created.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-08 19:15:53 +01:00
Mcat12 590f1f97f7
Merge remote-tracking branch 'origin/development' into new/API
# Conflicts:
#	FTL.h
#	socket.c
2018-01-21 09:48:41 -05:00
Mcat12 232507a51e
Merge remote-tracking branch 'origin/development' into new/API 2018-01-20 11:21:36 -05:00
DL6ER 7c10244e4d
Another small tweak for the test suite
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-20 15:21:16 +01:00
DL6ER 933bc52237
Fix tests due to corrected counting of forward destinations
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-20 15:18:33 +01:00
DL6ER c5c9c1788f
Merge pull request #197 from pi-hole/tweak/ignore-test-files
Ignore test-generated files
2018-01-15 17:28:32 +01:00
Mcat12 0013edb1c6
Merge remote-tracking branch 'origin/development' into new/API
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

# Conflicts:
#	main.c
#	request.c
#	routines.h
#	socket.c
2018-01-12 17:12:08 -05:00
DL6ER bb7bf43421
Merge pull request #180 from pi-hole/new/IPv6support
Add dual-stack socket support for FTL
2018-01-12 19:15:40 +01:00
Mcat12 6287495508
Properly track the git modules instead of ignoring
Git does not track the contents of submodules, which was what I was
trying to avoid with the previous commit. We can just specify them
upfront and only the commit at which the submodules pull from will be
stored.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-10 22:00:26 -05:00
DL6ER 13b2fb3c35
Merge branch 'development' into new/IPv6support
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	socket.c
2018-01-09 19:44:28 +01:00
DL6ER ff6258f456
Fine-tune new tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-09 00:04:20 +01:00
DL6ER 85cf6c6623
Extend tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-09 00:01:55 +01:00
Mcat12 b5c9c6e809
Fix socket test
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-04 12:23:16 -05:00
Mcat12 e527985371
Implement getStats using MessagePack
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-04 12:04:04 -05:00
Mcat12 595ab259ca
Remove HTTP API specific code so it can be replaced with a new protocol
Adjusted tests to fit the current lack of output on the unix socket.
Added TELNET enum and used it in place of the old SOCKET to better fit
with the rest of the code base.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-03 20:16:50 -05:00
Mcat12 f62f9f085c
Disable HTTP tests as authorization is not gained in the tests yet
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-03 14:35:58 -05:00
Mcat12 8adb3d335e
Merge remote-tracking branch 'origin/development' into new/API
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-03 14:35:42 -05:00
DL6ER b28a52c280
Extend test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-01 02:56:19 +01:00
DL6ER 9e40d006eb
Add Unix socket test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-01 01:05:17 +01:00
DL6ER e4e5b0d45e
Use special socket file on Travis
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-01 01:02:54 +01:00
DL6ER ddc305dfbd
Merge branch 'development' into new/IPv6support 2017-12-29 01:44:38 +01:00
DL6ER 30fb2e7bca
Disable IPv6 test for now due to broken IPv6 support on Travis (see https://github.com/travis-ci/travis-ci/issues/8361)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-26 11:55:08 +01:00
DL6ER a29da6065d
Add IPv6 socket connection test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-26 11:32:51 +01:00
Mark Drobnak 1f5ca043f1
Add status to test summary data 2017-12-23 00:07:26 -05:00
Mcat12 604ad7ec39
Merge remote-tracking branch 'origin/development' into new/API
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

# Conflicts:
#	request.c
#	test/test_suite.sh
2017-12-22 23:08:18 -05:00
DL6ER b61d035807
Update tests with new log format
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 16:15:34 +01:00
Mark Drobnak 95bdd62777
Merge pull request #167 from pi-hole/new/variablefilenames
Make long-term database location adjustable
2017-12-12 12:16:06 -05:00
DL6ER 49b229e51f
Another modifications to the changed test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-11 22:21:06 +01:00
DL6ER 7925a7755c
Adjust test to include a mixed domain
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-11 22:16:31 +01:00
DL6ER 4da545e057
Tweaks for Travis automated testing
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-07 22:20:34 +01:00
DL6ER 5da14ffcc7
Syntax error in test
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-22 18:47:27 +01:00
DL6ER 3ec7f59357
Adjust Travis tests as the hostname for 127.0.0.1 changed ... don't rely on it any longer
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-22 18:43:54 +01:00
DL6ER 9975f617bf
Add two tests for "invalid option" and "help"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-04 13:35:11 +01:00
DL6ER 94b08d8080
Adjust test suite to account for the extra return "status ..." in ">stats"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-05 17:53:35 +02:00
Mcat12 e2f2f0d2b7
Fix tests
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2017-09-27 00:40:50 -04:00
Mcat12 e5c4d19aaa
Merge remote-tracking branch 'origin/development' into new/API 2017-09-26 00:37:38 -04:00
DL6ER d8e037fc32
Send confirmation after ">kill" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-24 11:20:04 +02:00
DL6ER 1c7f8dc2c0
Adjust tests to check for percentages instead of absolute numbers
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-20 17:23:56 +02:00
DL6ER a8d0117cfc
Corrected tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-19 22:47:30 +02:00
DL6ER 21c9a497e2
Make "unique_clients" returning the number of clients that have been active within the most recent 24 hours (match the behavior of top-clients). Add "clients_ever_seen" to preserve the information of how many unique clients FTL has seen in its runtime (whether or not they have been active recently) 2017-08-13 14:53:45 +02:00
DL6ER 551351b178
We don't show "pi.hole" anymore in the results. Adjust tests (also for the API component) accordingly.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-08-07 12:43:25 +02:00
DL6ER f64251eb3f
Merge branch 'development' into new/API 2017-08-07 11:00:20 +02:00
DL6ER 320e10f211
Adapt test suite as pi.hole is now an ignored domain (we will also check for that it does not appear anywhere in the statistics)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-07-20 20:34:40 +02:00
Mcat12 c9de13b492
Merge remote-tracking branch 'origin/development' into new/API 2017-07-17 22:13:12 -04:00
DL6ER 8b316c3d8a Merge pull request #115 from pi-hole/fix/Travis-CI
Fix Travis test suite (work around a Travis bug)
2017-07-17 18:07:24 +02:00
DL6ER 5a5b04be43
Explicitly kill FTL at the end of the test suite to mitigate a Travis bug (https://github.com/travis-ci/travis-ci/issues/8082) 2017-07-17 11:53:45 +02:00
DL6ER 845bf8354f
Offer unsorted list of forward destinations (test may fails) 2017-07-08 13:59:23 +02:00
Mcat12 e0f462e1bf
The newline?
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2017-06-26 22:22:16 -04:00
Mcat12 5693b723a7
Fix top domains and ads tests
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2017-06-26 22:17:17 -04:00
DL6ER bbb3df2fe5
Add a missing space, our tests require 100% accuracy 2017-06-26 16:35:51 +02:00
DL6ER f566fd30dd
Fix tests 2017-06-26 16:27:02 +02:00
DL6ER 0dfb855605
Merge branch 'development' into new/API
Conflicts:
	request.c
2017-06-26 16:08:38 +02:00
DL6ER 9619f135f2
Adapt tests to consider additional API output 2017-06-19 19:47:32 +02:00
DL6ER 9893ef6896
Adjust tests with new black.list interpretation 2017-06-18 10:36:44 +02:00
DL6ER 17a7823020
Merge branch 'development' into new/API 2017-06-18 10:31:22 +02:00
DL6ER 9a51c12c95
Adjust last test 2017-06-17 22:31:52 +02:00
DL6ER 12d795af75
Adjust tests 2017-06-17 19:16:39 +02:00
DL6ER ec47c81128
Adjusted tests 2017-06-17 17:45:26 +02:00
DL6ER 94def4a9c9
Extend test suite - expected to fail 2017-06-17 14:31:05 +02:00
DL6ER f8072a0c24
Minor correction to API tests 2017-06-17 08:36:47 +02:00
DL6ER 3f330dd126
Make silent 2017-06-17 08:28:07 +02:00
DL6ER c29ce3b5fa
Add first API test 2017-06-16 19:32:43 +02:00
DL6ER b2688bfd35
Add type variable to all request subroutines which can later be used to decide whether the output whould be in telnet format, or JSON (possibly even "v2" JSON) 2017-06-12 20:48:50 +02:00
DL6ER 0ef2256fa5
Test for both ports 4711 and 4747 before starting the tests 2017-06-12 20:28:46 +02:00
DL6ER f84b461f3a
Add a small delay when starting the threads 2017-06-12 20:23:14 +02:00
DL6ER d7d57a85a2
Show last two lines of FTL logs when waiting for socket to become ready 2017-06-12 20:10:47 +02:00
DL6ER a4fc933966
Use silent mode if curl based tests to suppress progress meter display 2017-06-12 20:08:33 +02:00
DL6ER 35a1882e3b
Add HTTP server tests 2017-06-12 20:01:54 +02:00
DL6ER 91a722ec6a
Adapt tests to new insert statement 2017-06-12 12:34:01 +02:00
DL6ER 9fa2cfbf31
Prnt content of pihole-FTL.log 2017-06-12 12:11:30 +02:00
DL6ER 9c0776340d
Print content of pihole.log when testing 2017-06-12 12:09:06 +02:00
DL6ER 94c7f39d6c
Merge branch 'development' into new/db
Conflicts:
	Makefile
2017-06-12 12:07:04 +02:00
DL6ER b951b72aa9
Add database content test 2017-06-12 11:59:29 +02:00
DL6ER 27d48a8cdd
Try to connect on port 4711 2017-06-05 15:18:06 +02:00
DL6ER 380aee6689
Add test suite for FTL 2017-06-05 15:12:38 +02:00