Skip to content

Commit 30168c5

Browse files
committed
don't look for 'weaveproxy' - it no longer exists
... as of Weave Net 2.0
1 parent 6ef8281 commit 30168c5

5 files changed

+1
-6
lines changed

integration/100_launch_test.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ start_suite "Launch scope and check it boots"
88
weave_on "$HOST1" launch
99
scope_on "$HOST1" launch
1010

11-
wait_for_containers "$HOST1" 60 weave weaveproxy weavescope
11+
wait_for_containers "$HOST1" 60 weave weavescope
1212

1313
has_container "$HOST1" weave
14-
has_container "$HOST1" weaveproxy
1514
has_container "$HOST1" weavescope
1615

1716
scope_end_suite

integration/105_launch_sans_weave_test.sh

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ scope_on "$HOST1" launch
1010
wait_for_containers "$HOST1" 60 weavescope
1111

1212
has_container "$HOST1" weave 0
13-
has_container "$HOST1" weaveproxy 0
1413
has_container "$HOST1" weavescope
1514

1615
scope_end_suite

integration/200_clustering_2_test.sh

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and
1818

1919
check() {
2020
has_container "$1" weave 2
21-
has_container "$1" weaveproxy 2
2221
has_container "$1" weavescope 2
2322
has_container "$1" db1
2423
has_container "$1" db2

integration/205_clustering_sans_weave_2_test.sh

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and
1515

1616
check() {
1717
has_container "$1" weave 0
18-
has_container "$1" weaveproxy 0
1918
has_container "$1" weavescope 2
2019
has_container "$1" db1
2120
has_container "$1" db2

integration/210_clustering_custom_hostname_2_test.sh

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and
1818

1919
check() {
2020
has_container "$1" weave 2
21-
has_container "$1" weaveproxy 2
2221
has_container "$1" weavescope 2
2322
has_container "$1" db1
2423
has_container "$1" db2

0 commit comments

Comments
 (0)