github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-16 20:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feedback

Browse Source
This commit is contained in:
Tom Wilkie
2016-01-06 12:02:22 +00:00
parent d101b0fced
commit 57a06cb848
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration/310_container_to_container_edge_test.sh
View File

@@ -4,7 +4,7 @@
start_suite "Test short lived connections between containers"
WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch
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 \

4
integration/320_container_edge_cross_host_2_test.sh
View File

@@ -4,8 +4,8 @@
start_suite "Test short lived connections between containers on different hosts"
WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch $HOST1 $HOST2
WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST2 launch $HOST1 $HOST2
weave_on $HOST1 launch $HOST1 $HOST2
weave_on $HOST2 launch $HOST1 $HOST2
scope_on $HOST1 launch
scope_on $HOST2 launch

6
integration/330_application_edge_test.sh
View File

@@ -2,10 +2,10 @@
. ./config.sh
start_suite "Test short connections between processes"
start_suite "Test long connections (procspy) between processes"
WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch
scope_on $HOST1 launch
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 \
nc nginx.weave.local 80 || true; \

10
integration/340_application_edge_across_host_2_test.sh
View File

@@ -2,13 +2,13 @@
. ./config.sh
start_suite "Test connections between processes on different hosts"
start_suite "Test long connections (procspy) between processes on different hosts"
WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch $HOST1 $HOST2
WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST2 launch $HOST1 $HOST2
weave_on $HOST1 launch $HOST1 $HOST2
weave_on $HOST2 launch $HOST1 $HOST2
scope_on $HOST1 launch
scope_on $HOST2 launch
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 \

8
integration/config.sh
View File

@@ -38,7 +38,7 @@ scope_end_suite() {
# this checks we have a named node in the given view
has() {
local view=$1
local view=$1
local host=$2
local name=$3
local count=${4:-1}
@@ -63,7 +63,7 @@ container_id() {
# this checks we have an edge from container 1 to container 2
has_connection() {
local view="$1"
local view="$1"
local host="$2"
local from="$3"
local to="$4"
@@ -87,7 +87,7 @@ has_connection() {
}
wait_for() {
local view="$1"
local view="$1"
local host="$2"
local timeout="$3"
shift 2
@@ -115,5 +115,5 @@ wait_for() {
wait_for_containers() {
wait_for containers "$@"
wait_for containers "$@"
}