Paul Bellamy
0de292c0d4
[proxy] attach containers with --net=none to weave
2015-08-14 13:48:32 +01:00
Matthias Radestock
eaa5385069
refactor: use new proxy_start_container function
2015-08-13 19:54:00 +01:00
Matthias Radestock
fa2aa1f791
Merge branch '1.0'
...
Conflicts:
test/640_proxy_restart_reattaches_test.sh
2015-08-13 19:46:23 +01:00
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
78df99e7e7
Merge branch '1.0'
2015-08-13 14:37:31 +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
26f4a41900
Merge branch '1.0'
2015-08-13 14:07:22 +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
686500b181
Merge branch '1.0'
2015-08-13 14:05:35 +01:00
Matthias Radestock
84c5c52090
fix broken test silliness
2015-08-13 14:05:17 +01:00
Matthias Radestock
d5de0b41f9
Merge branch '1.0'
...
Conflicts:
proxy/proxy.go
2015-08-13 13:57:02 +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
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
7656752d87
unbreak test
...
caused by faulty merge
2015-08-12 07:40:20 +01:00
Matthias Radestock
d0ed225184
Merge branch '1.0'
...
Conflicts:
weave
2015-08-11 15:01:54 +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
Adam Harrison
fc9a1c8664
new weave status, weave status ..., and weave report
2015-08-11 12:15:13 +01:00
Matthias Radestock
cf6d6d0cd3
add test for PMTU discovery and packet fragmentation
2015-08-10 17:50:21 +01:00
Matthias Radestock
755a949f6d
Merge pull request #1277 from weaveworks/1275-negative-dns
...
Return NXDOMAIN when we don't have entries
and drop the non-authoritative special case for recursive dns.
Fixes #1275 .
2015-08-10 17:19:44 +01:00
Tom Wilkie
42debde746
Merge pull request #1259 from weaveworks/1257-proxy-chunking
...
Proxy chunking should handle arbitrarily large chunks
2015-08-10 15:57:19 +01:00
Tom Wilkie
c2d5b35cd6
Add test for negative DNS queries
2015-08-10 13:13:12 +00:00
Tom Wilkie
0a2701bbbc
Merge pull request #1268 from weaveworks/1243_fix_claim_test
...
add a sleep to improve test reliability
2015-08-10 10:23:48 +01:00
Matthias Radestock
1a11b989e7
simplify test
2015-08-07 14:40:34 +01:00
Paul Bellamy
f55655216f
[proxy] rewrite /etc/hosts from outside the container
...
Avoids problems when container user is non-root. Added a test for this
and the --no-rewrite-hosts flag.
2015-08-06 13:14:18 +01:00
Matthias Radestock
43ef3b8515
give routers some time to establish connectivity
2015-08-06 11:54:58 +01:00
Paul Bellamy
94db0beb25
don't save the python test file when running test/600
2015-08-05 18:04:49 +01:00
Matthias Radestock
6cc7749cf2
cosmetic: remove debug logging from test
2015-08-05 12:31:20 +01:00
Matthias Radestock
c47e57cc29
cosmetic
2015-08-05 11:55:11 +01:00
Paul Bellamy
157910ec9a
adding integration test for proxy handling large http chunks
2015-08-05 10:52:06 +01:00
Paul Bellamy
1d1ebc103d
Merge remote-tracking branch 'upstream/1.0'
2015-08-04 14:29:12 +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
55051f0194
Merge remote-tracking branch 'upstream/1.0'
2015-07-31 11:01:19 +01:00
Paul Bellamy
b7e8938ab4
scope the test runner call so scope works
2015-07-31 10:49:21 +01:00
Matthias Radestock
f8327c3c6c
expand test coverage to unicast relaying
...
by way of an ipam space request from host3 to host1, via host2.
2015-07-30 20:38:00 +01:00
Paul Bellamy
e3851e6e55
Merge pull request #1246 from weaveworks/gce-parameterize
...
parameterize test/gce.sh so scope can override TEMPLATE_NAME and NUM_HOSTS
2015-07-30 16:18:59 +01:00
Matthias Radestock
6a136eebb2
make parallel test running work locally
...
@tomwilkie assures me this change won't break CircleCI. We shall see.
This now works for me:
make clean
make COVERAGE=true
COVERDIR=test/coverage SLOW=true ./test/units.sh
cd test
./setup.sh
COVERAGE=true PARALLEL=true ./run_all.sh
./gen_coverage_reports.sh
2015-07-30 15:57:49 +01:00
Paul Bellamy
9396c046cd
parameterize test/gce.sh so scope can override TEMPLATE_NAME and NUM_HOSTS
2015-07-30 15:48:22 +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
Tom Wilkie
a87be89095
Typos. Honestly
2015-07-30 11:07:17 +00:00
Tom Wilkie
5c9a13d343
Shard 600_proxy_docker_py into 4.
2015-07-30 10:38:02 +00:00
Tom Wilkie
bfe07fc71a
Give each shard 5 VMs
2015-07-30 10:32:16 +00:00
Tom Wilkie
fa95b67c92
Add summary to bottom of test runner output.
...
Also, don't sort tests by #hosts when run sequentially, and fix typo in run_all.sh.
Fixes #1240
2015-07-30 10:29:05 +00:00
Tom Wilkie
669a0db528
Run integration tests in parallel when possible.
2015-07-29 17:28:58 +00:00
Paul Bellamy
4da999ba86
Merge pull request #1235 from weaveworks/gce
...
Improve CI run time
2015-07-29 17:38:30 +01:00
Tom Wilkie
6fe69590c4
Add coverage to proxy for integration tests.
2015-07-29 12:06:29 +00:00
Tom Wilkie
51128a6705
Parallelise the copying of /etc/hosts.
2015-07-29 09:58:51 +00:00
Tom Wilkie
e7676979ee
Parallelise the copying of imaages etc
2015-07-29 09:58:05 +00:00
Paul Bellamy