Commit Graph

198 Commits

Author SHA1 Message Date
diginc b372f0101d move docker image building to be a global autouse fixture to make sure it runs before tests that use output 2017-10-08 12:57:17 -05:00
diginc d98837c828 expand most tests to run for all os arch combos 2017-10-05 11:59:19 -05:00
diginc 3c6db584d7 split out test builds for each arch to help avoid travis timeout 2017-10-02 23:46:42 -05:00
diginc 18997fe9f6 templated dockerfiles building used by tests
* test images are built without diginc/ namespace
* no tests for other archs yet, unsure if they'll even build on travis
* Removed old dockerfiles
* New files names require Docker Cloud reconfiguration when merged upstream
* Probably some stuff I missed, just ask me
2017-10-02 22:52:02 -05:00
diginc 038930959f new version 2017-06-23 23:42:01 -05:00
diginc c9b08e8848 documenting and validating the Server IP env vars 2017-05-19 00:36:53 -05:00
diginc 0e2b77577d adding a alpine compatible list.sh 2017-05-13 18:43:34 -05:00
diginc b9095bc123 This commit is too big, but it works
* Tests are passing, hopefully consistently
* FTL pulling from official releases
  * thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
2017-05-13 17:03:24 -05:00
diginc 9f61b87198 debian converted to s6, aline files moved 2017-05-05 21:48:03 -05:00
diginc 20955a41fe alpine converted to s6 2017-05-04 22:37:26 -05:00
diginc 67346c2f75 fix up PIHOLE_INTERFACE default 2017-03-04 17:31:09 -06:00
diginc d23338407c bump versions, fix shell check failures 2017-03-03 23:13:11 -06:00
diginc 907d36ae9b Add web password support 2017-02-08 22:46:46 -06:00
diginc 4f1fb5ec01 Revert "re-enable arm as part of testing".
This reverts commit 14f7654549.

docker cloud runs a build for arm now and travis-ci times out on arm building through qemu.
2017-01-18 20:30:10 -06:00
diginc 14f7654549 re-enable arm as part of testing 2017-01-17 23:13:24 -06:00
diginc 5404d6124f re-do a few things to fix up test/handle updated code 2017-01-17 22:49:42 -06:00
diginc 73c054cbc5 runing as sh breaks tests, override testinfra 2017-01-17 22:48:59 -06:00
diginc d528878bac test passing...travis virtual environment is another story 2017-01-11 20:12:56 -06:00
diginc 9f20dcc708 disabled real adlists by default 2017-01-10 22:58:27 -06:00
diginc 136f43a995 various test fixes 2017-01-10 20:38:42 -06:00
Adam Hill ce49b19ade Merge pull request #82 from mattkenn4545/feature/dns-is-important
Ensure DNS is available early
2017-01-09 10:42:38 -06:00
diginc cc1c7a745d resolving alpine+nginx issues 2017-01-08 23:43:12 -06:00
Matthew Kennedy 0477dea085 Fix tests 2017-01-07 22:36:31 -07:00
diginc f9bb0c976a add pihole enable/disable tests 2016-11-06 15:12:11 -06:00
diginc f6006e09d5 add test for pihole scripts, restartDNS first test 2016-11-06 13:41:43 -06:00
diginc 6ec264e3b6 rename/clarify test and move RunningPiHole to global py.test scope 2016-11-06 13:40:24 -06:00
diginc 097f280c9b red test 2016-11-01 22:32:36 -05:00
diginc eddba93537 split out the bash function tests to own file 2016-10-31 23:42:08 -05:00
diginc 99c4921a84 common_start.sh now bash_functions.sh, dnsmasq test clarified 2016-10-30 13:47:06 -05:00
diginc 7465c0b064 Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
Conflicts:
	common_start.sh
2016-10-22 13:13:11 -05:00
diginc c9468eaabd Pi-hole and Web versions update + new stuff
* New code in shell scripts required killing systemctl in images
* Added tests for the quick IPv6 env hack I made a while back
* Stopped requiring the need for update.sh to copy gravity for alpine
 * (moved modifications to dockerfile)
* One step closer to unified start script for both OS versions
* Optimzed some test code
2016-10-20 22:44:44 -05:00
diginc 21eee5a0ca Shellcheck added to py.test and fixes
- Various minor quote fixes
- Optimized repeated echos into php conf for alpine
2016-10-08 14:56:06 -05:00
diginc 34419c5631 do not need these prints any more 2016-10-08 13:40:36 -05:00
diginc 61da6ce0ad fixes #55 DNS1 & DNS2 bug
- tests now watch for regression in these ENV var's behavior
- use local scope in function instead of exported for easier testing
2016-10-08 13:34:25 -05:00
diginc 822903189c Fixing issues with 1.9.2
- Case on IPv4addr was incorrect, gravity now requires it instead of piholeIP file
- debian:jessie no longer had dnsutils dig?  odd.
- py.test always pull the latest docker images to help reveal base image changes like above
- py.test stubbing of gravity was acciently not present in debian arm's start.sh
- pihole submodule using development branch latest
2016-10-06 18:51:05 -05:00
diginc 1e6eda27eb Persistent dig container running dns tests
* Sidekick to pi-hole links and queries DNS
* Lookup the default pi.hole against what was fed in as ServerIP
* Lookup a couple outside popular static DNS servers hostnames too
* a little pre-optimized to persist the dig container since docker start adds half a second (no virtually nothing for digs)
2016-09-07 23:07:38 -05:00
diginc e8cb52b23a ipv6 tests I skipped the other night 2016-09-07 20:39:01 -05:00
diginc 0204786139 adding armhf build for testing 2016-08-30 20:07:32 -05:00
diginc c341e0316f adding some missing files from merger mistakes 2016-08-28 02:30:10 -05:00
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