pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
900 Commits 20 Branches 106 Tags
c4f491d5ae2e2e6b8a1cbeee9e7a506ddeaaf3da
Commit Graph

74 Commits

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