diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-05-14 15:11:14 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-05-14 15:13:41 +1000 |
| commit | aa50bc580c7d18a85e1cb5cd7c36ef79c983a83f (patch) | |
| tree | baec5b7a31112b5fca8658e1ead1d7ace6961dd2 | |
| parent | 4563865fb6bf7efcbcf9a9940bb6d285021ddcb1 (diff) | |
| download | samba-aa50bc580c7d18a85e1cb5cd7c36ef79c983a83f.tar.gz samba-aa50bc580c7d18a85e1cb5cd7c36ef79c983a83f.tar.xz samba-aa50bc580c7d18a85e1cb5cd7c36ef79c983a83f.zip | |
tests: Move the "ctdb reloadips" test from complex/ to simple/
This is made possible by separation of public addresses files for
local daemons and the addition of get_ctdbd_command_line_option().
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 2bcd58b30d7cf6dd48ad7f019810c6965a44c85a)
| -rwxr-xr-x | ctdb/tests/simple/18_ctdb_reloadips.sh (renamed from ctdb/tests/complex/12_ctdb_reloadips.sh) | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ctdb/tests/complex/12_ctdb_reloadips.sh b/ctdb/tests/simple/18_ctdb_reloadips.sh index 5ea9024e685..e7b4e4d84a9 100755 --- a/ctdb/tests/complex/12_ctdb_reloadips.sh +++ b/ctdb/tests/simple/18_ctdb_reloadips.sh @@ -25,8 +25,6 @@ ctdb_test_init "$@" set -e -ctdb_test_check_real_cluster - cluster_is_healthy # Reset configuration @@ -36,8 +34,8 @@ select_test_node_and_ips echo "Emptying public addresses file on $test_node" -[ -n "$CTDB_BASE" ] || CTDB_BASE="/etc/ctdb" -addresses="${CTDB_BASE}/public_addresses" +addresses=$(get_ctdbd_command_line_option $test_node "public-addresses") +echo "Public addresses file on node $test_node is \"$addresses\"" backup="${addresses}.$$" restore_public_addresses () |