diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-09-12 13:20:43 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-09-23 08:06:12 +0200 |
| commit | 371543207e8955d6665fcec03b261d80cde2401b (patch) | |
| tree | 53b766fb7fd2e5bb7d4a6aeba5342ebb45c76abb /ctdb/tests/scripts | |
| parent | 81a8758b9b24bbb7200be4682016f989b904bda8 (diff) | |
| download | samba-371543207e8955d6665fcec03b261d80cde2401b.tar.gz samba-371543207e8955d6665fcec03b261d80cde2401b.tar.xz samba-371543207e8955d6665fcec03b261d80cde2401b.zip | |
ctdb-tests: Clean up some tests where IP movement is checked
Some of this implements logic that exists in functions. Some of it is
overly complicated and potentially failure-prone.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/scripts')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 1ca77cabdb..1835949a4f 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -152,7 +152,8 @@ sanity_check_ips () prev="$ipp" done <<<"$ips" - echo "BAD: a node was -1 or IPs are only assigned to one node" + echo "BAD: a node was -1 or IPs are only assigned to one node:" + echo "$ips" echo "Are you running an old version of CTDB?" return 1 } @@ -483,7 +484,7 @@ node_has_some_ips () wait_until_node_has_some_ips () { - echo "Waiting for node to have some IPs..." + echo "Waiting for some IPs to be assigned to node ${test_node}" wait_until 60 node_has_some_ips "$@" } |