Matthias Radestock
e51ecd73b3
refactor: extract helper
2015-06-18 19:01:10 +01:00
Matthias Radestock
5479d0a54d
improve test performance - only fetch status once per check
2015-06-18 18:53:06 +01:00
Matthias Radestock
6830b27317
cosmetic: correct some comments, tweak some arg parsing
2015-06-18 18:13:27 +01:00
Matthias Radestock
4399be7ad2
correct comments
2015-06-18 17:55:42 +01:00
Matthias Radestock
42d2a860eb
test more things, more obviously
2015-06-18 17:48:21 +01:00
Matthias Radestock
3ec0200067
cosmetic oops
2015-06-18 16:57:54 +01:00
Matthias Radestock
d1e4a8ec8a
cosmetic: vertical alignment and consistency for better readability
2015-06-18 16:26:16 +01:00
Matthias Radestock
501108e3ae
cosmetic: vertical alignment
2015-06-17 15:13:07 +01:00
Paul Bellamy
ca681bce13
[proxy] Add support for WEAVE_CIDR=none
...
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
2015-06-17 14:51:12 +01:00
Paul Bellamy
220c80c3ed
[proxy] --with-ipam -> --no-default-ipam
2015-06-17 11:31:33 +01:00
Matthias Radestock
809b048abd
fix sporadic 650_*.sh test failure caused by undefined variable
...
This is quite hilarious...
$BASE_IMAGE is not defined in config.sh. So running this test would
actually attempt to run something like
docker -H=... run -e WEAVE_CIDR=10.2.1.4/24 grep ^1$ /sys/class/net/ethwe/carrier
i.e. it would try to run the 'grep' image.
So why does this not fail all the time?
1) 610_*.sh defines $BASE_IMAGE.
2) 620_*.sh builds a 'grep' image.
If either of these tests are included in the same test run before
650_*.sh, then the latter will succeed.
Throw in our fabulous CircleCI scheduler, which distributes tests
according to their execution time, and you end up with sporadic
failures.
Fixes #938 .
2015-06-16 21:13:35 +01:00
Adam Harrison
b8afefa55f
Merge pull request #931 from paulbellamy/weavedns_default_search_domain
...
[dns] resolve names in `weave.local` by default unless hostname or search path is specified
2015-06-16 18:13:17 +01:00
Paul Bellamy
2c3baa9119
use weavedns search-domain by default
...
iff no hostname/dns-search specified
2015-06-16 15:13:19 +01:00
Alvaro Saurin
8a935e3cb2
Launch WeaveDNS with "launch_dns_on"
2015-06-16 15:29:36 +02:00
Paul Bellamy
af38f07d26
refactoring proxy dns test
2015-06-16 14:08:35 +01:00
Adam Harrison
b33d4497fa
Fix test broken by new default behaviour
2015-06-16 14:07:42 +01:00
Adam Harrison
e5b1cc21a9
Smoke test for new weave script DNS behaviour
2015-06-16 14:07:42 +01:00
Paul Bellamy
8873d69b77
[proxy] Add --without-dns flag, and change meaning of --with-dns flag
2015-06-16 14:07:40 +01:00
Alvaro Saurin
8621aa7cbf
Launch WeaveDNS with --debug when DEBUG is set
2015-06-16 14:58:53 +02:00
Bryan Boreham
79db00a90e
Strip trailing period from hostname generated from weavedns domain.
...
We strip at the calling point rather than in the server, because DNS
servers do see the domain as ending with a '.' representing the root.
2015-06-16 10:26:11 +01:00
Matthias Radestock
ee61f07d9b
refactor: extract rm_containers helper
...
cherry-picked from #898
2015-06-15 21:41:43 +01:00
Matthias Radestock
a844797d67
cosmetic: reduce test noise
2015-06-14 17:48:21 +01:00
Matthias Radestock
97d692df80
don't restart docker in test setup
...
due to that leaving container debris behind that docker takes ages to
clean up.
2015-06-12 15:01:35 +01:00
Matthias Radestock
a2146ca5b0
add tests for launching DNS with various ways of obtaining an IP
...
As a side effect this also tests repopulation on restart, so we can
remove the separate test for that.
2015-06-12 13:50:22 +01:00
Paul Bellamy
09f491821b
making test executable
2015-06-11 13:51:41 +01:00
Adam Harrison
c0cfacdb28
Repatriate itinerant smoke test
2015-06-11 12:54:07 +01:00
Paul Bellamy
d2b17690f9
use dnsutils image in one test instead of awk on all the tests.
2015-06-11 12:13:24 +01:00
Adam Harrison
8d7fe2b9e7
Renamed smoke test to avoid number clash
2015-06-11 11:55:21 +01:00
Adam Harrison
6b80dc035a
Simplify smoke test
2015-06-11 11:53:24 +01:00
Adam Harrison
a424bfe715
Correctly interpret long form arguments that lack an equals symbol
2015-06-11 10:27:34 +01:00
Adam Harrison
4f6ace8b10
Permit optional trailing dot on hostname
2015-06-11 10:27:34 +01:00
Adam Harrison
bed6a130d6
Smoke test for new weave run behaviour
2015-06-11 10:27:34 +01:00
Paul Bellamy
b9850ac200
[proxy] Set hostname and domainname based on container name, when dns
...
Had to make the assert_dns_record test helper more robust against
'getent hosts' returning duplicates
2015-06-11 10:27:29 +01:00
Bryan Boreham
a89b549c40
Change command-line syntax to net: prefix instead of --subnet
2015-06-10 17:28:06 +01:00
Bryan Boreham
7d881a0f0c
Check that weave ps returns exactly the CIDRs we are looking for, and comment assumption
2015-06-10 17:27:07 +01:00
Bryan Boreham
487bd2eaf7
Use zero-cidr-args form of 'weave detach' to test #862
2015-06-10 17:24:36 +01:00
Bryan Boreham
c301e6a380
Expand test to use IPAM and check addresses are freed
2015-06-10 17:24:36 +01:00
Bryan Boreham
2b4eec39cf
Support '--subnet default'
2015-06-10 17:21:16 +01:00
Bryan Boreham
d20d2e9142
Update smoke tests that use IPAM with default subnet
2015-06-10 17:21:16 +01:00
Bryan Boreham
ae8985deb5
Merge pull request #884 from rade/881_get_container_id_on_start
...
LGTM. Fixes #881
2015-06-10 17:20:25 +01:00
Paul Bellamy
2d5e362115
[proxy] use logs for getting proxy-env and proxy-config
...
It's ugly, but beats arg-parsing, inspecting the container and piecing
the address together from exposed ports.
We could just use the host from DOCKER_HOST, but that will fail in the
case of a host with multiple IPs, where the proxy only listens on one.
2015-06-10 15:24:53 +01:00
Matthias Radestock
7a2b5c43e7
feed full container id on weave start to DNS/IPAM
...
We erroneously assumed that `docker start` returned the full container
id. It doesn't and as a result we populated DNS with records with ids
other than full container ids. And that's also what we told IPAM. As a
result, DNS and IPAM didn't clean up after the container's death,
resulting in stale DNS entries and leaked IPs.
Fixes #881 .
2015-06-10 14:53:43 +01:00
Paul Bellamy
1ac5d4fe98
renaming dns_restart_test so it is picked up by test runner
2015-06-10 11:52:58 +01:00
Matthias Radestock
bd364f787e
fix silent failure in assert_dns_record test
...
If the name cannot be resolved, getent fails, which in turn causes
assert_dns_record to just return with a non-zero status at that point,
which causes the whole test to just terminate with a non-zero status,
but no indication whatsoever what had gone wrong.
2015-06-09 19:08:59 +01:00
Paul Bellamy
c31358259f
[proxy] Add tls support
...
Caveats:
* TLS files must be present on the target server (and readable)
* TLS file paths cannot contain spaces
* TLS file paths must be absolute (i.e. cannot be relative)
* Bash argument parsing is terrible
2015-06-05 13:23:14 +01:00
Paul Bellamy
91375a1095
Revert "First pass at Proxy SSL Support"
2015-06-02 12:48:38 +01:00
Paul Bellamy
3586ddcd63
Merge pull request #813 from paulbellamy/proxy-ssl
...
First pass at Proxy SSL Support
2015-06-02 12:48:31 +01:00
Matthias Radestock
fca02eb489
Merge pull request #706 from awh/dns_delete_individual_records
...
delete individual dns records
Closes #631 . Closes #654 .
2015-06-02 12:35:50 +01:00
Adam Harrison
56160e0798
Merge pull request #728 from paulbellamy/test-runner
...
allow test/run_all.sh to run specific test files
2015-06-02 12:30:15 +01:00
Matthias Radestock
cc1a5548af
reduce smoke test noise
2015-06-02 11:57:49 +01:00