Commit Graph

385 Commits

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