Merge pull request #2641 from weaveworks/2640-no-weave-run

make integration tests pass with latest Weave Net release (2.0) Fixes #2640.
weaveworks · Jun 25, 2017 · bc9e0e3 · bc9e0e3
2 parents 40bb28a + b2f14a9
commit bc9e0e3
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 33 deletions.
diff --git a/integration/100_launch_test.sh b/integration/100_launch_test.sh
@@ -8,10 +8,9 @@ start_suite "Launch scope and check it boots"
 weave_on "$HOST1" launch
 scope_on "$HOST1" launch
 
-wait_for_containers "$HOST1" 60 weave weaveproxy weavescope
+wait_for_containers "$HOST1" 60 weave weavescope
 
 has_container "$HOST1" weave
-has_container "$HOST1" weaveproxy
 has_container "$HOST1" weavescope
 
 scope_end_suite
diff --git a/integration/105_launch_sans_weave_test.sh b/integration/105_launch_sans_weave_test.sh
@@ -10,7 +10,6 @@ scope_on "$HOST1" launch
 wait_for_containers "$HOST1" 60 weavescope
 
 has_container "$HOST1" weave 0
-has_container "$HOST1" weaveproxy 0
 has_container "$HOST1" weavescope
 
 scope_end_suite
diff --git a/integration/200_clustering_2_test.sh b/integration/200_clustering_2_test.sh
@@ -18,7 +18,6 @@ sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and
 
 check() {
     has_container "$1" weave 2
-    has_container "$1" weaveproxy 2
     has_container "$1" weavescope 2
     has_container "$1" db1
     has_container "$1" db2

diff --git a/integration/205_clustering_sans_weave_2_test.sh b/integration/205_clustering_sans_weave_2_test.sh
@@ -15,7 +15,6 @@ sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and
 
 check() {
     has_container "$1" weave 0
-    has_container "$1" weaveproxy 0
     has_container "$1" weavescope 2
     has_container "$1" db1
     has_container "$1" db2

diff --git a/integration/210_clustering_custom_hostname_2_test.sh b/integration/210_clustering_custom_hostname_2_test.sh
@@ -18,7 +18,6 @@ sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and
 
 check() {
     has_container "$1" weave 2
-    has_container "$1" weaveproxy 2
     has_container "$1" weavescope 2
     has_container "$1" db1
     has_container "$1" db2

diff --git a/integration/310_container_to_container_edge_test.sh b/integration/310_container_to_container_edge_test.sh
@@ -7,11 +7,9 @@ start_suite "Test short lived connections between containers"
 
 weave_on "$HOST1" launch
 scope_on "$HOST1" launch
-weave_on "$HOST1" run -d --name nginx nginx
-weave_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
-	wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
-	sleep 1; \
-done"
+
+server_on "$HOST1"
+client_on "$HOST1"
 
 wait_for_containers "$HOST1" 60 nginx client
 

diff --git a/integration/311_container_to_container_edge_without_ebpf_test.sh b/integration/311_container_to_container_edge_without_ebpf_test.sh
@@ -7,11 +7,9 @@ start_suite "Test short lived connections between containers, without ebpf conne
 
 weave_on "$HOST1" launch
 scope_on "$HOST1" launch --probe.ebpf.connections=false
-weave_on "$HOST1" run -d --name nginx nginx
-weave_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
-	wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
-	sleep 1; \
-done"
+
+server_on "$HOST1"
+client_on "$HOST1"
 
 wait_for_containers "$HOST1" 60 nginx client
 

diff --git a/integration/313_container_to_container_edge_with_ebpf_proc_fallback_test.sh b/integration/313_container_to_container_edge_with_ebpf_proc_fallback_test.sh
@@ -12,11 +12,9 @@ weave_on "$HOST1" launch
 DOCKER_HOST=tcp://${HOST1}:${DOCKER_PORT} CHECKPOINT_DISABLE=true \
     WEAVESCOPE_DOCKER_ARGS="-v /tmp:/sys/kernel/debug/tracing:ro" \
     "${SCOPE}" launch
-weave_on "$HOST1" run -d --name nginx nginx
-weave_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
-	wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
-	sleep 1; \
-done"
+
+server_on "$HOST1"
+client_on "$HOST1"
 
 wait_for_containers "$HOST1" 60 nginx client
 

diff --git a/integration/314_container_accept_before_kretprobe_test.sh b/integration/314_container_accept_before_kretprobe_test.sh
@@ -10,7 +10,7 @@ weave_on "$HOST1" launch
 # Launch the server before Scope to make sure it calls accept() before Scope's
 # kretprobe on the accept function is installed. We use busybox' nc instead of
 # Alpine's nc so that it blocks on the accept() syscall.
-weave_on "$HOST1" run -d --name server busybox /bin/sh -c "while true; do \
+weave_proxy_on "$HOST1" run -d --name server busybox /bin/sh -c "while true; do \
 		date ;
 		sleep 1 ;
 	done | nc -l -p 8080"
@@ -19,7 +19,7 @@ scope_on "$HOST1" launch
 wait_for_containers "$HOST1" 60 server
 has_container "$HOST1" server
 
-weave_on "$HOST1" run -d --name client busybox /bin/sh -c "ping -c 5 server.weave.local; \
+weave_proxy_on "$HOST1" run -d --name client busybox /bin/sh -c "ping -c 5 server.weave.local; \
 	while true; do \
 		date ;
 		sleep 1 ;

diff --git a/integration/320_container_edge_cross_host_2_test.sh b/integration/320_container_edge_cross_host_2_test.sh
@@ -11,11 +11,8 @@ weave_on "$HOST2" launch "$HOST1" "$HOST2"
 scope_on "$HOST1" launch
 scope_on "$HOST2" launch
 
-weave_on "$HOST1" run -d --name nginx nginx
-weave_on "$HOST2" run -d --name client alpine /bin/sh -c "while true; do \
-	wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
-	sleep 1; \
-done"
+server_on "$HOST1"
+client_on "$HOST2"
 
 sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and send them reports
 

diff --git a/integration/330_process_edge_test.sh b/integration/330_process_edge_test.sh
@@ -7,8 +7,9 @@ start_suite "Test long connections (procspy) between processes"
 
 weave_on "$HOST1" launch
 scope_on "$HOST1" launch --probe.conntrack=false
-weave_on "$HOST1" run -d --name nginx nginx
-weave_on "$HOST1" run -dti --name client alpine /bin/sh -c "while true; do \
+
+server_on "$HOST1"
+weave_proxy_on "$HOST1" run -dti --name client alpine /bin/sh -c "while true; do \
 	nc nginx.weave.local 80 || true; \
 	sleep 1; \
 done"

diff --git a/integration/340_process_edge_across_host_2_test.sh b/integration/340_process_edge_across_host_2_test.sh
@@ -11,8 +11,8 @@ weave_on "$HOST2" launch "$HOST1" "$HOST2"
 scope_on "$HOST1" launch --probe.conntrack=false
 scope_on "$HOST2" launch --probe.conntrack=false
 
-weave_on "$HOST1" run -d --name nginx nginx
-weave_on "$HOST2" run -dti --name client alpine /bin/sh -c "while true; do \
+server_on "$HOST1"
+weave_proxy_on "$HOST2" run -dti --name client alpine /bin/sh -c "while true; do \
 	nc nginx.weave.local 80 || true; \
 	sleep 1; \
 done"

diff --git a/integration/410_container_control_test.sh b/integration/410_container_control_test.sh
@@ -8,7 +8,7 @@ start_suite "Test container controls"
 weave_on "$HOST1" launch
 scope_on "$HOST1" launch
 
-CID=$(weave_on "$HOST1" run -dti --name alpine alpine /bin/sh)
+CID=$(weave_proxy_on "$HOST1" run -dti --name alpine alpine /bin/sh)
 
 wait_for_containers "$HOST1" 60 alpine
 

diff --git a/integration/config.sh b/integration/config.sh
@@ -28,6 +28,24 @@ weave_on() {
     DOCKER_HOST=tcp://$host:$DOCKER_PORT CHECKPOINT_DISABLE=true "$WEAVE" "$@"
 }
 
+weave_proxy_on() {
+    local host=$1
+    shift 1
+    [ -z "$DEBUG" ] || greyly echo "Weave proxy on $host: $*" >&2
+    DOCKER_PORT=12375 docker_on "$host" "$@"
+}
+
+server_on() {
+    weave_proxy_on "$1" run -d --name nginx nginx
+}
+
+client_on() {
+    weave_proxy_on "$1" run -d --name client alpine /bin/sh -c "while true; do \
+    	wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
+	sleep 1; \
+    done"
+}
+
 scope_end_suite() {
     end_suite
     for host in $HOSTS; do