Merge branch '2.0'

.gitignore

@@ -37,7 +37,6 @@ coverage.html
 prog/weaver/weaver
 prog/weavedns/weavedns
 prog/weavehosts/weavehosts
-prog/weaveproxy/weaveproxy
 prog/sigproxy/sigproxy
 prog/weavewait/weavewait
 prog/weavewait/weavewait_noop
@@ -55,7 +54,6 @@ releases
 weave*.tar.gz
 prog/weaver/weave
 prog/weaveexec/weavehosts
-prog/weaveexec/weaveproxy
 prog/weaveexec/weavewait
 prog/weaveexec/weavewait_noop
 prog/weaveexec/weavewait_nomcast

prog/weaver/main_test.go

@@ -7,6 +7,7 @@ import (
 )
 
 func TestMain(t *testing.T) {
-	weavetest.TrimTestArgs()
-	main()
+	if weavetest.TrimTestArgs() {
+		main()
+	}
 }

site/weave-docker-api/troubleshooting-proxy.md

@@ -1,28 +0,0 @@
----
-title: Troubleshooting
-menu_order: 60
-search_type: Documentation
----
-
-The command
-
-    weave status
-
-reports on the current status of various Weave Net components, including
-the proxy, if it is running:
-
-```
-...
-        Service: proxy
-        Address: tcp://127.0.0.1:12375
-...
-```
-
-Information on the operation of the proxy can be obtained from the
-weaveproxy container logs using:
-
-    docker logs weaveproxy
-
-**See Also**
-
- * [Troubleshooting Weave](/site/troubleshooting.md)

test/090_docker_restart_policy_2_test.sh

@@ -12,7 +12,7 @@ assert_raises "check_restart $HOST1 weave"
 # in the old containers being removed and new ones created
 weave_on $HOST1 stop
 weave_on $HOST1 launch --no-restart
-assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave weaveproxy" "no"
+assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave" "no"
 assert_raises "! check_restart $HOST1 weave"
 
 # Relaunch to prevent the `weave stop` in `end_suite`

test/config.sh

@@ -136,9 +136,7 @@ stop_weave_on() {
     host=$1
     weave_on $host stop 1>/dev/null 2>&1 || true
     if [ -n "$COVERAGE" ]; then
-        for C in weaveplugin weave ; do
-            collect_coverage $host $C
-        done
+        collect_coverage $host weave
     fi
 }
 
@@ -322,8 +320,7 @@ check_restart() {
 start_suite() {
     for host in $HOSTS; do
         [ -z "$DEBUG" ] || echo "Cleaning up on $host: removing all containers and resetting weave"
-        PLUGIN_FILTER=$(docker_on $host inspect -f 'grep -v {{printf "%.12s" .Id}}' weaveplugin 2>/dev/null) || PLUGIN_FILTER=cat
-        rm_containers $host $(docker_on $host ps -aq 2>/dev/null | $PLUGIN_FILTER)
+        rm_containers $host $(docker_on $host ps -aq 2>/dev/null)
         weave_on $host reset 2>/dev/null
         run_on $host sudo rm -f /opt/cni/bin/weave-plugin-latest /opt/cni/bin/weave-net /opt/cni/bin/weave-ipam /etc/cni/net.d/10-weave.conf
     done

testing/util.go

@@ -35,8 +35,9 @@ func stackTrace(all bool) string {
 	return string(buf[:stacklen])
 }
 
-// TrimTestArgs finds the first -- in os.Args and trim all args before that
-func TrimTestArgs() {
+// TrimTestArgs finds the first -- in os.Args and trim all args before
+// that, returning true when a -- was in fact found.
+func TrimTestArgs() bool {
 	i, l := 0, len(os.Args)
 	for ; i < l; i++ {
 		if os.Args[i] == "--" {
@@ -44,7 +45,8 @@ func TrimTestArgs() {
 		}
 	}
 	if i == l {
-		panic("Specify weave args after --")
+		return false
 	}
 	os.Args = append(os.Args[:1], os.Args[i+1:l]...)
+	return true
 }