Simplify ping tests to avoid set -e precipitated exit in failure case

This commit is contained in:
Adam Harrison committed 2015-04-22 16:46:35 +01:00
1 parent d850ea41a2
commit 6a06d0f95f
2 files changed
+2 -4

No files matched your search

+1 -2
View File
@@ -18,7 +18,6 @@ weave_on $HOST2 launch $HOST1
weave_on $HOST2 run $C2/24 -t --name=c2 ubuntu
weave_on $HOST1 run $C1/24 -t --name=c1 ubuntu
ok=$(exec_on $HOST1 c1 ping -q -c 4 $C2 >&2 && echo ok)
assert "echo $ok" "ok"
assert_raises "exec_on $HOST1 c1 ping -q -c 4 $C2"
end_suite
+1 -2
View File
@@ -18,7 +18,6 @@ weave_on $HOST2 launch -password notverysecure $HOST1
weave_on $HOST2 run $C2/24 -t --name=c2 ubuntu
weave_on $HOST1 run $C1/24 -t --name=c1 ubuntu
ok=$(exec_on $HOST1 c1 ping -q -c 4 $C2 >&2 && echo ok)
assert "echo $ok" "ok"
assert_raises "exec_on $HOST1 c1 ping -q -c 4 $C2"
end_suite