Tom Wilkie
45293fdcac
Move ListVar into common, so it can be reused elsewhere.
2015-08-12 11:35:57 +00:00
Matthias Radestock
1a11b989e7
simplify test
2015-08-07 14:40:34 +01:00
Matthias Radestock
010792f714
cosmetic: more sensible order of weave commands
2015-08-07 11:44:47 +01:00
Matthias Radestock
536369bc12
Merge pull request #1265 from weaveworks/1252-proxy-non-root-hosts
...
[proxy] rewrite /etc/hosts from outside the container
Fixes #1252 .
2015-08-06 13:30:02 +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
Paul Bellamy
3180c67151
-no-rewrite-hosts -> --no-rewrite-hosts
2015-08-06 11:01:35 +01:00
Adam Harrison
457e162d0c
Merge branch '1.0'
...
Conflicts:
site/ipam.md
2015-08-06 09:56:50 +01:00
Adam Harrison
ed3207afe7
Merge remote-tracking branch 'upstream/latest_release_doc_updates' into 1.0
2015-08-06 09:51:31 +01:00
Adam Harrison
8e5b0ceceb
Merge pull request #1262 from weaveworks/latest_release_doc_udpates
...
Fix IPAM doc bug
2015-08-06 09:48:14 +01:00
Tom Wilkie
f9127e90db
Merge pull request #1263 from weaveworks/integration-tests-no-save-file
...
don't save the python test file when running test/600
2015-08-05 18:50:22 +01:00
Paul Bellamy
94db0beb25
don't save the python test file when running test/600
2015-08-05 18:04:49 +01:00
Adam Harrison
4a1bb1a33a
Fix IPAM doc bug
2015-08-05 17:53:24 +01:00
Adam Harrison
77996158ef
Merge branch '1.0'
2015-08-05 14:42:09 +01:00
Adam Harrison
93984e1955
Merge pull request #1261 from weaveworks/arp_all_ips
...
send ARP update for *all* container IPs; not just the first one
2015-08-05 14:38:16 +01:00
Matthias Radestock
67aae051d6
send ARP update for *all* container IPs; not just the first one
...
This was missed in #498 .
2015-08-05 13:35:35 +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
Matthias Radestock
de6f5a93e8
refactor: extract build flags
2015-08-05 11:11:57 +01:00
Paul Bellamy
1d1ebc103d
Merge remote-tracking branch 'upstream/1.0'
2015-08-04 14:29:12 +01:00
Paul Bellamy
eee13e7dd9
Merge pull request #1253 from weaveworks/1241-no-command-specified
...
[proxy] Handle case where no command is specified.
2015-08-04 13:11:35 +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
Matthias Radestock
9c22066bdb
Merge pull request #1256 from weaveworks/1245-dns-loadbalancing
...
Add note to explain DNS shuffle effects.
Fixes #1245 .
2015-08-04 12:22:23 +01:00
Tom Wilkie
f241e15ec1
Review feedback
2015-08-04 11:00:32 +00:00
Tom Wilkie
881ece3553
Add note to explain dns shuffle effects.
2015-08-04 10:47:36 +00:00
Michael Bridgen
281bf02871
Merge branch 'pr1254'
2015-08-03 15:26:08 +01:00
Michael Bridgen
778038fdd3
Merge branch 'fix-dotted-imports-for-log' of https://github.com/dpw/weave into pr1254
2015-08-03 14:29:53 +01:00
David Wragg
e7ee72836d
Log -> log
2015-08-03 14:13:24 +01:00
David Wragg
31c0506b85
Eliminate dotted imports of common for the sake of Log
2015-08-03 14:07:16 +01:00
David Wragg
7d6f85424c
Move OnOff into router.go
2015-08-03 14:06:23 +01:00
Tom Wilkie
ca89cfee3d
Merge pull request #1250 from paulbellamy/testrunner-summarize-fails
...
Some usability tweaks to the test runner
2015-07-31 12:36:50 +01:00
Paul Bellamy
5a37f652c2
add -v to testrunner, and less output in happy path
2015-07-31 12:25:50 +01:00
Paul Bellamy
cc7b781bb3
have testrunner summarize failed tests so they are easier to find
2015-07-31 12:12:33 +01:00
Paul Bellamy
55051f0194
Merge remote-tracking branch 'upstream/1.0'
2015-07-31 11:01:19 +01:00
Paul Bellamy
78e0e79b26
Merge pull request #1238 from weaveworks/1232-weavewait-image
...
[proxy] only mount /w into weavewaited containers
2015-07-31 10:57:26 +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
Paul Bellamy
e2389a4061
[proxy] Don't try to attach if container failed to start
2015-07-30 13:31:47 +01:00
Paul Bellamy
dccd199369
Merge pull request #1242 from weaveworks/1239-600-docker-py
...
Shard 600_proxy_docker_py into 4.
2015-07-30 13:14:54 +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
Adam Harrison
728203912e
.gitignore Vim recovery files
2015-07-30 10:53:59 +01:00
Paul Bellamy
27289e7b7b
Merge pull request #1236 from weaveworks/1169-frugal-frugal-frugal
...
Run integration tests in parallel when possible.
2015-07-30 10:16:39 +01: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