ctdb-scripts: Drop some tests for "reconfigure" event and monitor replay
authorMartin Schwenke <martin@meltin.net>
Thu, 15 Dec 2016 04:25:14 +0000 (15:25 +1100)
committerAmitay Isaacs <amitay@samba.org>
Fri, 16 Dec 2016 07:42:32 +0000 (08:42 +0100)
These features are going away.  There is nothing to reconfigure for
NFS anyway.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tests/eventscripts/60.nfs.multi.003.sh [deleted file]
ctdb/tests/eventscripts/60.nfs.multi.004.sh [deleted file]
ctdb/tests/eventscripts/60.nfs.multi.005.sh [deleted file]
ctdb/tests/eventscripts/60.nfs.multi.006.sh [deleted file]

diff --git a/ctdb/tests/eventscripts/60.nfs.multi.003.sh b/ctdb/tests/eventscripts/60.nfs.multi.003.sh
deleted file mode 100755 (executable)
index aed1f34..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "takeip, take reconfigure lock, monitor -> replay error"
-
-setup_nfs
-
-public_address=$(ctdb_get_1_public_address)
-
-err="foo: bar error occurred"
-
-ok_null
-
-simple_test_event "takeip" $public_address
-
-ctdb_fake_scriptstatus 1 "ERROR" "$err"
-
-eventscript_call ctdb_reconfigure_take_lock
-
-required_result 1 <<EOF
-Replaying previous status for this script due to reconfigure...
-$err
-EOF
-
-simple_test_event "monitor"
diff --git a/ctdb/tests/eventscripts/60.nfs.multi.004.sh b/ctdb/tests/eventscripts/60.nfs.multi.004.sh
deleted file mode 100755 (executable)
index d01f96b..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "takeip, take reconfigure lock, monitor -> reconfigure, replay timed out"
-
-setup_nfs
-
-public_address=$(ctdb_get_1_public_address)
-
-err="waiting, waiting..."
-
-ok_null
-
-simple_test_event "takeip" $public_address
-
-ctdb_fake_scriptstatus -62 "TIMEDOUT" "$err"
-
-eventscript_call ctdb_reconfigure_take_lock
-
-required_result 1 <<EOF
-Replaying previous status for this script due to reconfigure...
-[Replay of TIMEDOUT scriptstatus - note incorrect return code.] $err
-EOF
-
-simple_test_event "monitor"
diff --git a/ctdb/tests/eventscripts/60.nfs.multi.005.sh b/ctdb/tests/eventscripts/60.nfs.multi.005.sh
deleted file mode 100755 (executable)
index da334fd..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "takeip, take reconfigure lock, monitor -> reconfigure, replay disabled"
-
-setup_nfs
-
-public_address=$(ctdb_get_1_public_address)
-
-err=""
-
-ok_null
-
-simple_test_event "takeip" $public_address
-
-ctdb_fake_scriptstatus -8 "DISABLED" "$err"
-
-eventscript_call ctdb_reconfigure_take_lock
-
-ok <<EOF
-Replaying previous status for this script due to reconfigure...
-[Replay of DISABLED scriptstatus - note incorrect return code.] $err
-EOF
-
-simple_test_event "monitor"
diff --git a/ctdb/tests/eventscripts/60.nfs.multi.006.sh b/ctdb/tests/eventscripts/60.nfs.multi.006.sh
deleted file mode 100755 (executable)
index 84bb9ef..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "reconfigure (synthetic), twice"
-# This checks that the lock is released...
-
-setup_nfs
-
-public_address=$(ctdb_get_1_public_address)
-
-err=""
-
-ok <<EOF
-Reconfiguring service "nfs"...
-EOF
-
-simple_test_event "reconfigure"
-simple_test_event "reconfigure"