diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-01-16 10:35:41 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-01-20 11:11:00 +0100 |
| commit | 0054f0c54fcbed8f80f04f4f0264b4647e59db3f (patch) | |
| tree | 8a8d1dba86bbfae0109da28ca84ea624eff58a9a /ctdb/tests/simple | |
| parent | 04d896a5feece12c6576dbcf807213760dafa010 (diff) | |
| download | samba-0054f0c54fcbed8f80f04f4f0264b4647e59db3f.tar.gz samba-0054f0c54fcbed8f80f04f4f0264b4647e59db3f.tar.xz samba-0054f0c54fcbed8f80f04f4f0264b4647e59db3f.zip | |
tests: add a all_ips_on_node() helper function that wraps ctdb ip -Y
metze
(This used to be ctdb commit c24fbea156dfdc9154e94eace725526e44cbcdac)
Diffstat (limited to 'ctdb/tests/simple')
| -rwxr-xr-x | ctdb/tests/simple/16_ctdb_config_add_ip.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/simple/17_ctdb_config_delete_ip.sh | 4 | ||||
| -rwxr-xr-x | ctdb/tests/simple/23_ctdb_moveip.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/tests/simple/16_ctdb_config_add_ip.sh b/ctdb/tests/simple/16_ctdb_config_add_ip.sh index aaee472873a..79849f2c5b6 100755 --- a/ctdb/tests/simple/16_ctdb_config_add_ip.sh +++ b/ctdb/tests/simple/16_ctdb_config_add_ip.sh @@ -46,7 +46,7 @@ cluster_is_healthy ctdb_restart_when_done echo "Getting list of public IPs..." -try_command_on_node 0 "$CTDB ip -n all | sed -e '1d'" +all_ips_on_node 0 # When selecting test_node we just want a node that has public IPs. # This will work and is economically semi-randomly. :-) diff --git a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh b/ctdb/tests/simple/17_ctdb_config_delete_ip.sh index 4ea34bd270c..04329469938 100755 --- a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh +++ b/ctdb/tests/simple/17_ctdb_config_delete_ip.sh @@ -21,7 +21,7 @@ Steps: 3. Delete one public IP address being be served by the node, using 'ctdb delip'. 4. Verify that the delete IP address is no longer listed using the - 'ctdb ip' command. + all_ips_on_node helper function. Expected results: @@ -42,7 +42,7 @@ cluster_is_healthy ctdb_restart_when_done echo "Getting list of public IPs..." -try_command_on_node -v 0 "$CTDB ip -n all | sed -e '1d'" +all_ips_on_node -v 0 # Select an IP/node to remove. num_ips=$(echo "$out" | wc -l) diff --git a/ctdb/tests/simple/23_ctdb_moveip.sh b/ctdb/tests/simple/23_ctdb_moveip.sh index 68a7f70f917..b025dc7d3da 100755 --- a/ctdb/tests/simple/23_ctdb_moveip.sh +++ b/ctdb/tests/simple/23_ctdb_moveip.sh @@ -50,7 +50,7 @@ if [ $num_nodes -lt 2 ] ; then fi echo "Getting list of public IPs..." -try_command_on_node -v 0 "$CTDB ip -n all | sed -e '1d'" +all_ips_on_node -v 0 sanity_check_ips "$out" |