From: Martin Schwenke <martin@meltin.net>
Date: Sat, 7 Jul 2018 09:58:38 +0000 (+1000)
Subject: ctdb-tests: Drop event script tests where CTDB_MANAGED_<service>=no
X-Git-Tag: tevent-0.9.37~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c08c95c9e5b091bf77ff6e8ced0a7bf1e0e82f74;p=thirdparty%2Fsamba.git

ctdb-tests: Drop event script tests where CTDB_MANAGED_<service>=no

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

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh b/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
deleted file mode 100755
index 85b78edf62e..00000000000
--- a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "Not managed, clamd not listening"
-
-setup
-
-setup_script_options <<EOF
-CTDB_MANAGES_CLAMD=no
-CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
-EOF
-
-ok_null
-simple_test
diff --git a/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh b/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
deleted file mode 100755
index 00f8180901f..00000000000
--- a/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed, check no-op"
-
-setup "down"
-
-ok_null
-
-simple_test
diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh b/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
deleted file mode 100755
index 328e1e49cbf..00000000000
--- a/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed"
-
-setup "down"
-
-ok_null
-simple_test
diff --git a/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh b/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
deleted file mode 100755
index 328e1e49cbf..00000000000
--- a/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed"
-
-setup "down"
-
-ok_null
-simple_test
diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh b/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
deleted file mode 100755
index 00f8180901f..00000000000
--- a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed, check no-op"
-
-setup "down"
-
-ok_null
-
-simple_test
diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh b/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
deleted file mode 100755
index 328e1e49cbf..00000000000
--- a/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed"
-
-setup "down"
-
-ok_null
-simple_test
diff --git a/ctdb/tests/eventscripts/41.httpd.startup.001.sh b/ctdb/tests/eventscripts/41.httpd.startup.001.sh
deleted file mode 100755
index 328e1e49cbf..00000000000
--- a/ctdb/tests/eventscripts/41.httpd.startup.001.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed"
-
-setup "down"
-
-ok_null
-simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh b/ctdb/tests/eventscripts/49.winbind.monitor.001.sh
deleted file mode 100755
index 00f8180901f..00000000000
--- a/ctdb/tests/eventscripts/49.winbind.monitor.001.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed, check no-op"
-
-setup "down"
-
-ok_null
-
-simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh b/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
deleted file mode 100755
index 328e1e49cbf..00000000000
--- a/ctdb/tests/eventscripts/49.winbind.shutdown.001.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed"
-
-setup "down"
-
-ok_null
-simple_test
diff --git a/ctdb/tests/eventscripts/49.winbind.startup.001.sh b/ctdb/tests/eventscripts/49.winbind.startup.001.sh
deleted file mode 100755
index 328e1e49cbf..00000000000
--- a/ctdb/tests/eventscripts/49.winbind.startup.001.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed"
-
-setup "down"
-
-ok_null
-simple_test
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.001.sh b/ctdb/tests/eventscripts/50.samba.monitor.001.sh
deleted file mode 100755
index 00f8180901f..00000000000
--- a/ctdb/tests/eventscripts/50.samba.monitor.001.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed, check no-op"
-
-setup "down"
-
-ok_null
-
-simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.001.sh b/ctdb/tests/eventscripts/60.nfs.monitor.001.sh
deleted file mode 100755
index 00f8180901f..00000000000
--- a/ctdb/tests/eventscripts/60.nfs.monitor.001.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "not managed, check no-op"
-
-setup "down"
-
-ok_null
-
-simple_test