summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2016-12-15 10:17:25 +1100
committerAmitay Isaacs <amitay@samba.org>2016-12-16 08:42:32 +0100
commit25aad0df06038d0b595f09d947b9977dcc0ec8a8 (patch)
tree68c7432ee856bab61d416dae59610ee339d8e540
parent15d5ed7bb7a6bcb090ea1a13e8602e664a2f25f7 (diff)
downloadsamba-25aad0df06038d0b595f09d947b9977dcc0ec8a8.tar.gz
ctdb-tests: Fix "ctdb reloadips" simple test
The name of the addresses file to modify is based on the original selection of a test node at the top of the test. Repeating the selection a test node can result in a mismatch between the new test node and the addresses file. This occurs on local daemons, because the addresses file name has the original node number in it but the test is being performed on the the newly selected node number. For some reason this test has only occasionally failed. An upcoming commit that stops the output of "ctdb ip" from being reversed causes this test to fail (nearly?) every time. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12470 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
-rwxr-xr-xctdb/tests/simple/18_ctdb_reloadips.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/ctdb/tests/simple/18_ctdb_reloadips.sh b/ctdb/tests/simple/18_ctdb_reloadips.sh
index 760e4766a7b..b68ecfa617b 100755
--- a/ctdb/tests/simple/18_ctdb_reloadips.sh
+++ b/ctdb/tests/simple/18_ctdb_reloadips.sh
@@ -81,8 +81,6 @@ EOF
try_command_on_node any $CTDB sync
-select_test_node_and_ips
-
echo "Removing IP $test_ip from node $test_node"
try_command_on_node $test_node "mv $addresses $backup && grep -v '^${test_ip}/' $backup >$addresses"