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
Tom Wilkie
da36c78942
Reduce the number of times gcs.sh ssh's into the VMs
2015-07-29 09:41:57 +00:00
Tom Wilkie
88144ac7f8
Review feedback
2015-07-28 14:16:38 +00:00
Tom Wilkie
9779e06f66
Extend scheduler to periodically garbage collect stranded VMs
2015-07-28 13:19:38 +01:00
Matthias Radestock
9a91b3ce9c
include directory of test code in coverage
...
Fixes #1220 .
2015-07-27 17:08:31 +01:00
Matthias Radestock
536ce992fc
re-enable test
...
our switch on CircleCI from Docker 1.7.0 to 1.7.1 should make this
pass now.
2015-07-27 14:47:55 +01:00
Paul Bellamy
34bb7ae84a
[circle] use new gce templates for docker 1.7.1
2015-07-27 12:51:12 +01:00
Matthias Radestock
aa4efd63ef
cosmetic: uncomment test the way ordained by emacs
2015-07-22 16:55:43 +01:00
Tom Wilkie
062a25a032
Make unit test timeout 8mins.
2015-07-22 12:19:12 +00:00
Tom Wilkie
9e6d08c606
Put 2m timeout on all unit tests.
2015-07-22 11:56:39 +00:00
Matthias Radestock
3c107d675a
Merge branch '1.0'
2015-07-21 11:42:49 +01:00
Paul Bellamy
aa8466f688
[proxy] Mount weavewait readonly so it can't be tampered with
2015-07-21 11:30:56 +01:00
Tom Wilkie
a9dae46110
When running unit tests, output coverage for imported modules.
2015-07-20 15:47:07 +00:00
Paul Bellamy
7b9e59833e
test upload_executable helper should mkdir before uploading
2015-07-20 10:58:39 +01:00
Tom Wilkie
5baddb83cb
Comment out failing test until we figure out what to do.
2015-07-20 09:45:02 +00:00
Bryan Boreham
c3c40b15f1
Avoid hanging the caller when we try to claim from a dead peer
2015-07-16 16:12:23 +01:00
Bryan Boreham
2fa65f0a22
Smoke-test for claim operation
2015-07-16 16:12:23 +01:00
Matthias Radestock
70110e483c
Merge pull request #1166 from weaveworks/dns-tests
...
Make 210_dns_cross_hosts_test.sh excercise gossip dns tombstones.
2015-07-16 16:11:58 +01:00
Paul Bellamy
a0876becbc
Merge remote-tracking branch 'upstream/1.0'
...
Conflicts:
proxy/create_container_interceptor.go
proxy/create_exec_interceptor.go
proxy/proxy.go
proxy/start_container_interceptor.go
2015-07-16 15:29:29 +01:00
Tom Wilkie
db77570779
Test is too long
2015-07-16 13:40:39 +00:00
Paul Bellamy
1132d26d47
[proxy] do not weave attach containers in '--net=host|container:<name|id>'
2015-07-16 13:58:27 +01:00
Tom Wilkie
6e5995964d
Make 210_dns_cross_hosts_test.sh excercise gossip dns tombstones.
...
Also, make gce.sh less verbose, and do the env dance correctly.
2015-07-16 12:48:00 +00:00
Paul Bellamy
0865f4c207
Merge pull request #1099 from weaveworks/1055-proxy-autoconfig
...
Proxy autoconfig
2015-07-16 13:33:21 +01:00
Paul Bellamy
a4a31e632b
[proxy] Choose where to listen based on how launching client connected
2015-07-16 12:44:39 +01:00
Matthias Radestock
23ad547db4
Merge pull request #1155 from weaveworks/dns-gossip
...
Make DNS gossip converge correctly
Fixes #1151
2015-07-15 20:37:43 +01:00
Matthias Radestock
4d887c8a55
Merge branch '1.0'
...
Conflicts:
proxy/create_exec_interceptor.go
test/610_proxy_wait_for_weave_test.sh
2015-07-15 18:07:11 +01:00
Tom Wilkie
73210b6a70
Make sure DNS Gossip converges correctly.
...
- Abide by gossip interface (return nil, not empty gossip) so gossip converges!
- Make sure we don't say an old entry version is new to us; add some more tests.
- Add dns test for 3 (or N) hosts
- Extend mock gossip router to ensure reconsumption off diffs yield nil
- Don't increment version when re-adding existing entry.
2015-07-15 15:54:52 +00: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
9507ea93dd
rename test since we have two 250_*
2015-07-15 14:46:51 +01:00
Alfonso Acosta
25589562cd
Restart docker after vagrant tweaking and refactor tweak-code
...
Docker needs to be restarted and not started, since it already starts running after installation
2015-07-15 09:31:47 +00:00
Matthias Radestock
36292216fd
rename tests so they actually run
...
These tests were introduced in #1065 and #1126 .
2015-07-14 19:47:15 +01:00
Matthias Radestock
86448a1025
fix breakage
...
This wasn't spotted because #1065 , which removed launch-dns, got
merged just before #1126 , which introduced this test.
2015-07-14 19:42:59 +01:00
Adam Harrison
a3dc2d0482
Smoketest dns-lookup
2015-07-14 17:36:30 +01:00
Matthias Radestock
7ae06ef00d
Merge pull request #1126 from weaveworks/issues/1018-more-flexible-hostname-derivation
...
[proxy] More flexible container name -> hostname derivation
Closes #1018 .
2015-07-14 17:31:53 +01:00
Tom Wilkie
361ed1b4a6
Resolve unqualified domains in the weave.local domain.
2015-07-14 16:05:41 +00:00