Revert "Merge pull request #1580 from weaveworks/1579-launch-proxy-mount-h"

This reverts commit 262352f8bb, reversing
changes made to 312691376a due to a bug
whereby `weave env` returns a unix domain socket with an incorrect path.

This change will be superceeded by #1694.
This commit is contained in:
Adam Harrison committed 2015-11-17 16:28:31 +00:00
1 parent 262352f8bb
commit 7987d09438
2 files changed
+6 -30

No files matched your search

@@ -2,7 +2,7 @@
. ./config.sh
start_suite "Various launch-proxy configurations"
start_suite "Boot the proxy should only listen on client's interface"
# Booting it over unix socket listens on unix socket
run_on $HOST1 COVERAGE=$COVERAGE sudo -E weave launch-proxy
@@ -22,11 +22,6 @@ assert_raises "run_on $HOST1 sudo docker -H unix:///var/run/weave/weave.sock ps"
assert_raises "proxy docker_on $HOST1 ps"
weave_on $HOST1 stop-proxy
# Booting it with -H outside /var/run/weave, still works
socket="$(mktemp -d)/weave.sock"
weave_on $HOST1 launch-proxy -H unix://$socket
assert_raises "run_on $HOST1 sudo docker -H unix:///$socket ps" 0
weave_on $HOST1 stop-proxy
# Booting it over tls errors
assert_raises "DOCKER_CLIENT_ARGS='--tls' weave_on $HOST1 launch-proxy" 1