1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-26 09:09:07 +02:00
Commit Graph

159 Commits

Author SHA1 Message Date
diginc
bf50686b9f Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2016-08-28 02:05:50 -05:00
diginc
da44042bd4 fixed problem with nginx admin, added test! 2016-08-28 02:01:48 -05:00
Adam Hill
0b54098462 Revert "py.test now builds containers, travis py.test" 2016-08-28 01:31:23 -05:00
diginc
30fe0a3353 Added more http endpoint tests
Forgot to uncomment these, revealed a flaw in the nginx config
nginx now has parity with lighttpd for pages it returns and return codes
2016-08-28 01:13:04 -05:00
diginc
3b74e8d3e3 Tests working again, along with persistent tests with an actual running pi-hole container 2016-08-28 00:45:26 -05:00
diginc
d40ee18689 Refactor testinfra docker to support parametrize
This accomplishes the same thing as the previous tests, without using testinfra docker's boilerplate example, which had some drawbacks: Adding @parametrize to the previous version didn't allow overriding the pytest.mark docker arg, image:tag, or cmd with a parametrized test containing different expected results associated with either the alpine/debian tag.  Isntead it'd run all the parameters against both tags...e.g. nginx and lighttpd test would run agains both alpine and docker when parametizing on the test level.
2016-08-02 23:32:51 -05:00
diginc
b41dd1bf8c py.test now builds containers, travis py.test
* Instead of using the docker_dev, py.test builds and runs containers
* Travis-CI hopefully can run these same tests on PR/Merges now
2016-07-18 10:44:55 -05:00
diginc
4225e4cd7c remove a few unecessary lines 2016-07-16 16:02:49 -05:00
diginc
b3879c8729 Fix to debian lighttpd php config #19 w/tests 2016-07-16 16:00:20 -05:00