From: Martin Schwenke <martin@meltin.net>
Date: Tue, 21 Aug 2018 01:18:34 +0000 (+1000)
Subject: ctdb-tests: Drop DisableIPFailover simple test
X-Git-Tag: tdb-1.3.17~2022
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e160d331aaccd64b1a767c0bde9e310c80afe06;p=thirdparty%2Fsamba.git

ctdb-tests: Drop DisableIPFailover simple test

This is about to become a config file option that can't be dynamically
changed at run-time, so drop this test for now.  This test will be added
once the tunable becomes a config file option.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13589

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/simple/19_ip_takeover_noop.sh b/ctdb/tests/simple/19_ip_takeover_noop.sh
index c48379e5877..af0cdee383b 100755
--- a/ctdb/tests/simple/19_ip_takeover_noop.sh
+++ b/ctdb/tests/simple/19_ip_takeover_noop.sh
@@ -3,10 +3,7 @@
 test_info()
 {
     cat <<EOF
-Check that CTDB operates correctly if:
-
-* DisableIPFailover is set; or
-* there are 0 public IPs configured
+Check that CTDB operates correctly if there are 0 public IPs configured
 
 This test only does anything with local daemons.  On a real cluster it
 has no way of updating configuration.
@@ -31,30 +28,6 @@ ctdb_restart_when_done
 
 select_test_node_and_ips
 
-echo "Setting DisableIPFailover=1 on all nodes"
-try_command_on_node all $CTDB setvar DisableIPFailover 1
-
-echo "Getting \"before\" IP allocation..."
-try_command_on_node -v any $CTDB ip all
-before="$out"
-
-echo "Disabling node ${test_node}..."
-try_command_on_node "$test_node" $CTDB disable
-wait_until_node_has_status $test_node disabled
-
-echo "Getting \"after\" IP allocation..."
-try_command_on_node -v any $CTDB ip all
-after="$out"
-
-if [ "$before" == "$after" ] ; then
-	echo "GOOD: IP allocation is unchanged"
-	echo
-else
-	die "BAD: IP allocation changed"
-fi
-
-echo "----------------------------------------"
-
 daemons_stop
 
 echo "Starting CTDB with an empty public addresses configuration..."