Matthias Radestock
710eabeff3
reduce test vm memory
2015-07-11 12:15:46 +01:00
Matthias Radestock
603f34e944
oops, forgot to commit this
2015-07-11 12:14:43 +01:00
Matthias Radestock
a3dff7e1e9
cope with more than two test hosts
2015-07-11 11:59:34 +01:00
Matthias Radestock
25486f7b4d
cosmetic: s/weave_stop_router/stop_router_on
...
Also run `weave stop-router` as part of this, so conntrack cleanup
happens.
2015-07-11 11:58:29 +01:00
Matthias Radestock
c22d824db8
.gitignore and clean up coverage reports
2015-07-11 11:57:01 +01:00
Matthias Radestock
a44a3a4158
cure "./gen_coverage_reports.sh: line 5: CIRCLECI: unbound variable"
2015-07-11 11:46:49 +01:00
Matthias Radestock
982c9d7650
remove dead code
2015-07-11 11:17:44 +01:00
Matthias Radestock
7042c1506a
cosmetic: consistency with other tests
2015-07-11 03:36:21 +01:00
Matthias Radestock
76943f0b17
cosmetic
2015-07-11 02:52:30 +01:00
Matthias Radestock
c4f516655d
refactor: simplify ipam claim try
2015-07-11 02:28:14 +01:00
Matthias Radestock
aaba681db1
remove dead code
2015-07-11 01:54:37 +01:00
Tom Wilkie
56a169b50f
Merge pull request #1115 from weaveworks/unit-coverage
...
Run unit tests in circle and include their coverage in the report.
2015-07-10 19:34:48 +01:00
Tom Wilkie
32b2ec4038
Run unit tests in circle and include their coverage in the report. Report coveralls.io from Circle.
2015-07-10 18:19:50 +00:00
Matthias Radestock
ce5052305d
fix CircleCI breakage
2015-07-10 18:44:30 +01:00
Matthias Radestock
0e94e3e07b
complain even less about absent weave container in coverage collection
2015-07-10 18:30:13 +01:00
Matthias Radestock
3d72670105
don't complain in coverage collection when weave container is absent
2015-07-10 18:24:19 +01:00
Tom Wilkie
f8718dcc5d
Remove duplication of coverage stanza in weave script.
2015-07-10 16:35:46 +00:00
Paul Bellamy
e3212d462d
Merge pull request #1105 from weaveworks/673-smoke-test-coverage
...
Code coverage for smoke tests.
2015-07-10 16:53:59 +01:00
Tom Wilkie
f5186e74c0
Review feedback
2015-07-10 15:33:00 +00:00
Tom Wilkie
bf814739ba
Reduce repetition in Makefile.
2015-07-10 15:03:54 +00:00
Tom Wilkie
00a7490a1d
Code coverage for smoke tests.
...
Allow non-circle people to build coverage reports.
2015-07-10 14:45:14 +00:00
Adam Harrison
da41604229
Fix IPAM test compilation
2015-07-10 15:43:28 +01:00
Adam Harrison
d5a4326b9e
Merge branch '1.0'
...
Conflicts:
ipam/allocator_test.go
ipam/claim.go
2015-07-10 14:35:41 +01:00
Adam Harrison
835d99e6fe
Merge pull request #1104 from weaveworks/1083-async-claim
...
Don't wait to claim addresses from IPAM
2015-07-10 14:03:05 +01:00
Bryan Boreham
75646d4786
Merge remote-tracking branch 'origin/1.0'
...
Conflicts:
router/connection.go
2015-07-09 12:56:37 +01:00
Bryan Boreham
b93070f91a
Fix log message on peer move
2015-07-09 12:51:52 +01:00
Bryan Boreham
cbcd5da680
Fix log message on peer move
2015-07-09 12:33:39 +01:00
Bryan Boreham
cf4ce0a07d
Don't cancel address claim when caller closes socket
2015-07-09 10:47:34 +01:00
Bryan Boreham
78c4b06492
Don't wait for certainty before responding to Claim
...
Conflicts:
ipam/claim.go
2015-07-09 10:47:27 +01:00
David Wragg
501f40d9c1
Consolidate remote peer checks
2015-07-08 17:21:32 +01:00
Matthias Radestock
08463ea403
Merge branch '1.0'
2015-07-08 16:54:24 +01:00
Matthias Radestock
2ced8b9469
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-08 16:53:13 +01:00
Matthias Radestock
26c1bcf866
clarify role of IP allocator range
...
Part of #1035 .
2015-07-08 16:51:25 +01:00
Tom Wilkie
89ad7e1ba2
Move test gossip router out of ipam code for use in gossip dns code.
2015-07-08 15:03:13 +00:00
Matthias Radestock
e6828e1aa5
Merge pull request #1101 from weaveworks/misc-changes
...
Extend router/peers.go to allow multiple OnGC callbacks
2015-07-08 16:00:22 +01:00
Tom Wilkie
c8718d85dc
Extend router/peers.go to allow multiple OnGC callbacks, and call the callbacks outside of the peers lock.
2015-07-08 14:47:02 +00:00
Tom Wilkie
56863c3d0e
Ensure bin/lint doesn't complain about removed files when used as a git precommit script.
2015-07-08 14:43:21 +00:00
David Wragg
e50b1f1fe7
Remove the "found" return value from Peers Fetch method
...
Callers can simply check whether the returned *Peer is nil.
2015-07-08 09:06:33 +01:00
David Wragg
5e10b901a3
Drop the check for duplicate connections in the handshake
...
Duplicate connections are also detected and handled in AddConnection,
I have not been able to reproduce #182 without the check, so although
it may once have been necessary, it doesn't seem to be needed now.
2015-07-08 09:03:51 +01:00
David Wragg
a6a74001bd
Make TCPReceiver more closely mirror TCPSender
2015-07-08 08:53:53 +01:00
Bryan Boreham
0b032386c1
Merge pull request #1092 from weaveworks/1082_usage_to_stderr
...
Note I have rebased this and merged changes. Closes #1082 .
2015-07-07 15:43:23 +01:00
Matthias Radestock
8eb092c754
display usage on stderr
...
so that the likes of $(weave proxy-typo-env) don't do weird things
Closes #1082 .
2015-07-07 15:39:47 +01:00
Alvaro
33921c2cfe
Merge pull request #1073 from weaveworks/971_check_container_alive_in_api
...
make container aliveness check part of the ipam & dns API
2015-07-07 16:08:40 +02:00
Matthias Radestock
6cc566fd3e
Merge pull request #1090 from weaveworks/1076-ignore-iface
...
Don't complain about weave bridge routes clashing
Fixes #1076 .
2015-07-07 13:12:41 +01:00
Matthias Radestock
491a4369d7
Merge pull request #1096 from squaremo/issue1087_password_equals
...
Handle --option=value as well as --option value
Closes #1087 .
2015-07-07 12:57:01 +01:00
Bryan Boreham
6666fd14ac
Allow multiple --ignore-iface arguments
2015-07-07 12:52:29 +01:00
Bryan Boreham
e621aca77e
Added --ignore-iface option to netcheck and use it to ignore weave bridge route
2015-07-07 12:52:29 +01:00
Adam Harrison
3e7c20b4ee
Merge branch '1.0'
2015-07-07 12:46:00 +01:00
Michael Bridgen
22446ffc19
Handle --option=value as well as --option value
...
In any place we munge options, treat the form with an equals the same
as the form without.
The exes ultimately invoked by the script handle both forms, so unless
we need to do something with the option in the script, we can just let
options fall through.
2015-07-07 12:44:37 +01:00
Matthias Radestock
f39791616d
Merge pull request #1095 from weaveworks/move-ipam-address
...
Move ipam/address to net/address
Closes #1065 .
2015-07-07 11:43:47 +01:00
Matthias Radestock