Matthias Radestock
65578211ef
extract test functions for "start container via proxy"
...
This also eliminates the redefinition of 'start_container' by some of
the tests, which causes failures when multiple tests are run with
`run_all.sh`.
Fixes #1294 .
2015-08-13 15:01:15 +01:00
Matthias Radestock
90ed76853c
fix test breakage
...
on master, and only when running via `run_all.sh`. Weird.
2015-08-13 14:36:30 +01:00
Matthias Radestock
a3b4d6cdbf
consistency: use $SMALL_IMAGE instead of $BASE_IMAGE
...
whenever possible
2015-08-13 14:06:43 +01:00
Matthias Radestock
84c5c52090
fix broken test silliness
2015-08-13 14:05:17 +01:00
Matthias Radestock
bd41d114b5
Merge pull request #1291 from weaveworks/docker-1.8
...
Docker 1.8 compatibility.
Fixes #1287 .
2015-08-13 13:53:03 +01:00
Matthias Radestock
94d2f84364
refactor: use proxy abstraction
2015-08-13 13:50:29 +01:00
Paul Bellamy
bf2b456af1
Don't use .Volumes in tests, as it's gone in docker 1.8
2015-08-13 13:36:47 +01:00
Paul Bellamy
2576e819a7
Revert "fix intermittent test failure"
...
This reverts commit e2fec3d007 .
Was causing a failure on circleci
2015-08-13 11:12:50 +01:00
Paul Bellamy
e2fec3d007
fix intermittent test failure
...
Tests were running in the same shell, so function definitions were
leaking between tests.
2015-08-12 11:14:51 +01:00
Matthias Radestock
f8639a57e7
prevent proxy from interferring with weave run
...
...which could result in containers unexpectedly getting multiple IP
addresses.
Fixes #1279 .
2015-08-11 14:02:23 +01:00
Paul Bellamy
7cc53c4c68
[proxy] Handle case where no command is specified.
...
The docker daemon can't do this because we set /w/w.
2015-08-04 12:32:42 +01:00
Paul Bellamy
4958b8d37a
[proxy] Mount /w from the host for weavewaited containers
...
We set it at container create. Had tried also setting it at start, but
it seems to cause weird behaviour, and there is no way to do it from the
CLI.
2015-07-30 15:11:03 +01:00
Paul Bellamy
aa8466f688
[proxy] Mount weavewait readonly so it can't be tampered with
2015-07-21 11:30:56 +01:00
Paul Bellamy
1132d26d47
[proxy] do not weave attach containers in '--net=host|container:<name|id>'
2015-07-16 13:58:27 +01:00
Paul Bellamy
e4422205e8
[proxy] should not attempt weavewait in on weave container's execs
2015-07-15 16:14:14 +01:00
Matthias Radestock
6386c1bd18
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-14 15:36:55 +01:00
Adam Harrison
e26e7e29f2
Improvements to password handling recommendations
2015-07-14 14:48:58 +01:00
Adam Harrison
d427c99161
Add smoke test
2015-07-02 14:29:38 +01:00
Bryan Boreham
a938608cc8
Call weave reset before deleting containers, to improve clean-down
2015-07-01 13:19:43 +01:00
Adam Harrison
d6dca80dd7
Merge branch 'latest_release_doc_updates' into 1.0
...
Pull in GCE fix
2015-06-23 14:49:36 +01:00
Tom Wilkie
74c391f19c
Update gce.sh make_template command, and build a fresh template.
2015-06-23 14:48:48 +01:00
Matthias Radestock
1a17b41bc3
reduce test output noise
2015-06-23 09:42:46 +01:00
Matthias Radestock
2e5e0a7730
remove pointless assertion
2015-06-23 09:42:46 +01:00
Matthias Radestock
b2f62cc635
show test failure output
...
step towards fixing #970
2015-06-23 09:42:46 +01:00
Paul Bellamy
34aa2e32d8
[proxy] Only prepend weavewait if not already present
...
This way `docker commit` will not stack up weavewaits.
2015-06-22 15:24:49 +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