rename proxy-(env|config) to (env|config)
Keep error message to stderr, as the proxy should be launched with 'weave launch'. 'proxy-(env|config)' are kept with a deprecation warning, for a while.
This commit is contained in:
1 parent
5c7763b075
commit
5c44f74475
5 files changed
+25
-20
No files matched your search
@@ -4,15 +4,19 @@
|
||||
|
||||
start_suite "Configure the docker daemon for the proxy"
|
||||
|
||||
# No output when nothing running
|
||||
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 proxy-env)' ; docker $CMD"
|
||||
assert_raises "docker $(weave_on $HOST1 proxy-config) $CMD"
|
||||
assert_raises "eval '$(weave_on $HOST1 env)' ; docker $CMD"
|
||||
assert_raises "docker $(weave_on $HOST1 config) $CMD"
|
||||
|
||||
# Check we can use the weave script through the proxy
|
||||
assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; $WEAVE version"
|
||||
assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; $WEAVE ps"
|
||||
assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; $WEAVE launch-router"
|
||||
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"
|
||||
|
||||
end_suite
|
||||
Reference in new issue
Block a user