Adjust integration tests

weaveworks · May 31, 2017 · 1b56042 · 1b56042
1 parent 06bb515
commit 1b56042
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...ation/301_internet_edge_with_ebpf_test.sh → ...on/301_internet_edge_without_ebpf_test.sh b/...ation/301_internet_edge_with_ebpf_test.sh → ...on/301_internet_edge_without_ebpf_test.sh
@@ -3,10 +3,10 @@
 # shellcheck disable=SC1091
 . ./config.sh
 
-start_suite "Test short lived connections from the Internet [DISABLED]"
+start_suite "Test short lived connections from the Internet without ebpf [DISABLED]"
 
 weave_on "$HOST1" launch
-scope_on "$HOST1" launch --probe.ebpf.connections=true
+scope_on "$HOST1" launch --probe.ebpf.connections=false
 
 ## Test disabled: it is currently flaky
 ## https://github.com/weaveworks/scope/issues/2308

diff --git a/...ainer_to_container_edge_with_ebpf_test.sh → ...er_to_container_edge_without_ebpf_test.sh b/...ainer_to_container_edge_with_ebpf_test.sh → ...er_to_container_edge_without_ebpf_test.sh
@@ -3,10 +3,10 @@
 # shellcheck disable=SC1091
 . ./config.sh
 
-start_suite "Test short lived connections between containers, with ebpf connection tracking enabled"
+start_suite "Test short lived connections between containers, without ebpf connection tracking enabled"
 
 weave_on "$HOST1" launch
-scope_on "$HOST1" launch --probe.ebpf.connections=true
+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; \

diff --git a/...ntainer_edge_same_netns_with_ebpf_test.sh → ...iner_to_container_edge_same_netns_test.sh b/...ntainer_edge_same_netns_with_ebpf_test.sh → ...iner_to_container_edge_same_netns_test.sh
@@ -3,9 +3,9 @@
 # shellcheck disable=SC1091
 . ./config.sh
 
-start_suite "Test short lived connection between containers in same network namespace, with ebpf connection tracking enabled"
+start_suite "Test short lived connection between containers in same network namespace"
 
-scope_on "$HOST1" launch --probe.ebpf.connections=true
+scope_on "$HOST1" launch
 docker_on "$HOST1" run -d --name nginx nginx
 docker_on "$HOST1" run -d --net=container:nginx --name client albanc/dialer /go/bin/dialer connectshortlived localhost:80
 

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
@@ -11,7 +11,7 @@ weave_on "$HOST1" launch
 # to make ebpf fail and test the proc fallback.
 DOCKER_HOST=tcp://${HOST1}:${DOCKER_PORT} CHECKPOINT_DISABLE=true \
     WEAVESCOPE_DOCKER_ARGS="-v /tmp:/sys/kernel/debug/tracing:ro" \
-    "${SCOPE}" launch --probe.ebpf.connections=true
+    "${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; \

diff --git a/integration/314_container_accept_before_kretprobe_test.sh b/integration/314_container_accept_before_kretprobe_test.sh
@@ -15,7 +15,7 @@ weave_on "$HOST1" run -d --name server busybox /bin/sh -c "while true; do \
 		sleep 1 ;
 	done | nc -l -p 8080"
 
-scope_on "$HOST1" launch --probe.ebpf.connections=true
+scope_on "$HOST1" launch
 wait_for_containers "$HOST1" 60 server
 has_container "$HOST1" server