1ccea93c16
revert to old setup
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 00:18:55 -06:00
9c7b02aba9
Slow down after setup to try to fix test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-13 23:45:17 -06:00
ca4fe84df2
add some more details to ouput to debut travis failure
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-13 23:26:21 -06:00
f9a21d2ff9
empty the adlist for tests
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-12 22:16:15 -06:00
1685ed342f
Another flaky test, logs of readme
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 02:08:20 -06:00
236b2f1ed6
Slow down all the flakey tests to pass 100%
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 00:09:37 -06:00
7ecf7c6f28
Fixed tests!
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-08 23:14:48 -06:00
fca7769b33
remove ServerIP requirement, simpler example commands
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-07 19:51:15 -06:00
d6642fc191
broken test (works outside tests), not required for release
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 11:45:40 -06:00
8ece19132d
deploy support for RCs, fix enable test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-02 12:59:02 -06:00
d3309ebb1a
remove old blocking page setup/test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 22:43:38 -06:00
38d76d7ec8
fix conftest path to VERSION
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 20:37:05 -06:00
440a7a19a5
v4.2 and Version pulled from a file now
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-20 23:59:35 -06:00
f3cf5dc858
Adding test and check for resolv.conf
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-10 00:28:39 -06:00
19fee6fa5e
README update for 4.1.1 and test improvement
...
* split out arg fixture to improve grainularity of test overriding
* README points out new arguments that improve likelihood of success
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-08 21:01:42 -06:00
a5211510db
Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN)
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:46:34 -06:00
d0b35cec63
4.1.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-24 11:23:17 -06:00
5b3b0009bc
Added test to confirm updates are blocked
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 12:19:32 -06:00
b3beb91b52
update deploy version to 4.1 and fix broken server test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:38 -06:00
b39a2ad69a
arm version complained/crashed on no TTY
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:08 -06:00
d7a125a706
Version 4.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-12 20:43:08 -06:00
10c44c9374
switch to using pihole/debian-base for pam fix
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-31 22:40:29 -05:00
a47f278df0
cleanup uncessary build dep stuff
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-30 21:13:34 -05:00
63f2c4ea00
Fixing error with random passwords, null checking moved earlier
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-09-18 00:11:26 -05:00
f8d37693ed
Fix regex writing for web, fix deploying latest
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 22:23:22 -05:00
65a1ac7f1e
grab version on startup for web footer. 2 tests stablized
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:20:55 -05:00
999f02b598
start of fixing race condition by not having test+s6 both run /start.sh
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:13:25 -05:00
80d5b9dbc1
Test image name updates, passing locally. reorg Dockerfile to build fast, starting on new deploy
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 13:31:58 -05:00
520669a6b9
merge in dev/master armel goodies
2018-07-19 22:18:34 -05:00
478b98c503
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-17 19:44:34 -05:00
c17cd37eca
armel build script and dockerfile stuffs
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:43:55 -05:00
70acf54c2c
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
2018-07-10 23:16:40 -05:00
3171feef4c
allow no for DNS2
2018-07-06 08:01:41 +00:00
3877a171da
fix startup 53 port conflict and test error
2018-07-04 14:11:18 -05:00
ad6b4be403
Fixes to the startup, services, and dnsmasq references
2018-07-03 00:19:01 -05:00
53f766876e
Adding fix for #229
...
* Updates references in /var/www/html to also use WEB_PORT custom HTTP port
* Also a deploy script I use for uploading ARM/Multiarch so I stop pulling it out of bash history
2018-02-22 23:11:53 -06:00
3bcdd27cb9
fix ipv6 test
2018-01-04 22:30:40 -06:00
b33ea3b77f
fixed the tests
2018-01-03 21:35:53 -06:00
615af98eab
delete all the alpine
2018-01-03 20:09:47 -06:00
d9fa9b1016
alpine 3.2 startup tests fixed, web still failing
2017-12-11 10:28:15 -06:00
7c6c48e133
rest of loading tests fixed, undo heredoc tab2space
2017-12-07 23:39:34 -06:00
988e17be7a
some of the debian_amd64 load_as_expected tests fixed, tab2spaces
2017-12-07 23:30:54 -06:00
aab0b3f3cb
fix debian test_pihole_start_cmd
2017-12-07 20:27:06 -06:00
eb7b0a1fd7
add firstboot marker allow setup of servers if they are passed in but never again
2017-11-19 23:15:44 -06:00
50fee7d832
Adding custom web port with tests
2017-11-14 22:33:05 -06:00
94c90d9b91
comma
2017-11-05 21:30:32 -06:00
bcfcc85ef3
removed impossible testing combos
2017-11-05 21:30:07 -06:00
8886784b2e
fix webserver and image
2017-10-18 22:24:22 -05:00
dded3945f5
switch to dash, update persist to use new style tag
2017-10-18 22:02:23 -05:00
7c85ac8d32
Split build out from tests to ensure it runs first
2017-10-16 23:45:39 -05:00
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
d98837c828
expand most tests to run for all os arch combos
2017-10-05 11:59:19 -05:00
3c6db584d7
split out test builds for each arch to help avoid travis timeout
2017-10-02 23:46:42 -05:00
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
038930959f
new version
2017-06-23 23:42:01 -05:00
c9b08e8848
documenting and validating the Server IP env vars
2017-05-19 00:36:53 -05:00
0e2b77577d
adding a alpine compatible list.sh
2017-05-13 18:43:34 -05:00
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
9f61b87198
debian converted to s6, aline files moved
2017-05-05 21:48:03 -05:00
20955a41fe
alpine converted to s6
2017-05-04 22:37:26 -05:00
67346c2f75
fix up PIHOLE_INTERFACE default
2017-03-04 17:31:09 -06:00
d23338407c
bump versions, fix shell check failures
2017-03-03 23:13:11 -06:00
907d36ae9b
Add web password support
2017-02-08 22:46:46 -06:00
4f1fb5ec01
Revert "re-enable arm as part of testing".
...
This reverts commit 14f7654549
2017-01-18 20:30:10 -06:00
14f7654549
re-enable arm as part of testing
2017-01-17 23:13:24 -06:00
5404d6124f
re-do a few things to fix up test/handle updated code
2017-01-17 22:49:42 -06:00
73c054cbc5
runing as sh breaks tests, override testinfra
2017-01-17 22:48:59 -06:00
d528878bac
test passing...travis virtual environment is another story
2017-01-11 20:12:56 -06:00
9f20dcc708
disabled real adlists by default
2017-01-10 22:58:27 -06:00
136f43a995
various test fixes
2017-01-10 20:38:42 -06:00
ce49b19ade
Merge pull request #82 from mattkenn4545/feature/dns-is-important
...
Ensure DNS is available early
2017-01-09 10:42:38 -06:00
cc1c7a745d
resolving alpine+nginx issues
2017-01-08 23:43:12 -06:00
0477dea085
Fix tests
2017-01-07 22:36:31 -07:00
f9bb0c976a
add pihole enable/disable tests
2016-11-06 15:12:11 -06:00
f6006e09d5
add test for pihole scripts, restartDNS first test
2016-11-06 13:41:43 -06:00
6ec264e3b6
rename/clarify test and move RunningPiHole to global py.test scope
2016-11-06 13:40:24 -06:00
097f280c9b
red test
2016-11-01 22:32:36 -05:00
eddba93537
split out the bash function tests to own file
2016-10-31 23:42:08 -05:00
99c4921a84
common_start.sh now bash_functions.sh, dnsmasq test clarified
2016-10-30 13:47:06 -05:00
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
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
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
34419c5631
do not need these prints any more
2016-10-08 13:40:36 -05:00
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
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
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
e8cb52b23a
ipv6 tests I skipped the other night
2016-09-07 20:39:01 -05:00
0204786139
adding armhf build for testing
2016-08-30 20:07:32 -05:00
c341e0316f
adding some missing files from merger mistakes
2016-08-28 02:30:10 -05:00
bf50686b9f
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2016-08-28 02:05:50 -05:00
da44042bd4
fixed problem with nginx admin, added test!
2016-08-28 02:01:48 -05:00
0b54098462
Revert "py.test now builds containers, travis py.test"
2016-08-28 01:31:23 -05:00
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
3b74e8d3e3
Tests working again, along with persistent tests with an actual running pi-hole container
2016-08-28 00:45:26 -05:00
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
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
4225e4cd7c
remove a few unecessary lines
2016-07-16 16:02:49 -05:00
b3879c8729
Fix to debian lighttpd php config #19 w/tests
2016-07-16 16:00:20 -05:00
Adam Hill
StefanSchoof
Matthew Kennedy