[proxy] Fix bug in weave env/config when passing multiple -H flags
The echo in proxy_addr was not preserving newlines, so the multiple addrs were all getting returned
This commit is contained in:
1 parent
d5e63b875b
commit
fd07f59d16
2 files changed
+26
-11
No files matched your search
@@ -2,6 +2,13 @@
|
||||
|
||||
. ./config.sh
|
||||
|
||||
CMD="run -e WEAVE_CIDR=10.2.1.4/24 $SMALL_IMAGE $CHECK_ETHWE_UP"
|
||||
|
||||
check() {
|
||||
assert_raises "eval '$(weave_on $HOST1 env)' ; docker $CMD"
|
||||
assert_raises "docker $(weave_on $HOST1 config) $CMD"
|
||||
}
|
||||
|
||||
start_suite "Configure the docker daemon for the proxy"
|
||||
|
||||
# No output when nothing running
|
||||
@@ -9,14 +16,16 @@ assert "weave_on $HOST1 env" ""
|
||||
assert "weave_on $HOST1 config" ""
|
||||
|
||||
weave_on $HOST1 launch-proxy
|
||||
|
||||
CMD="run -e WEAVE_CIDR=10.2.1.4/24 $SMALL_IMAGE $CHECK_ETHWE_UP"
|
||||
assert_raises "eval '$(weave_on $HOST1 env)' ; docker $CMD"
|
||||
assert_raises "docker $(weave_on $HOST1 config) $CMD"
|
||||
check
|
||||
|
||||
# Check we can use the weave script through the proxy
|
||||
assert_raises "eval '$(weave_on $HOST1 env)' ; $WEAVE version"
|
||||
assert_raises "eval '$(weave_on $HOST1 env)' ; $WEAVE ps"
|
||||
assert_raises "eval '$(weave_on $HOST1 env)' ; $WEAVE launch-router"
|
||||
|
||||
# Check we can use weave env/config with multiple -Hs specified
|
||||
weave_on $HOST1 stop
|
||||
weave_on $HOST1 launch-proxy -H tcp://0.0.0.0:12375 -H unix:///var/run/weave/weave.sock
|
||||
check
|
||||
|
||||
end_suite
|
||||
Reference in new issue
Block a user