Commit Graph
19 Commits
Author SHA1 Message Date
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 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
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 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
DL6ER 17a7823020 Merge branch 'development' into new/API 2017-06-18 10:31:22 +02:00
DL6ER 94def4a9c9 Extend test suite - expected to fail 2017-06-17 14:31:05 +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 d7d57a85a2 Show last two lines of FTL logs when waiting for socket to become ready 2017-06-12 20:10:47 +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 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