diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2018-06-21 16:42:47 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-07-05 06:52:43 +0200 |
| commit | 99fa3a343f61213cf4cf214751ede0a7568f3167 (patch) | |
| tree | a17a0c09a0e5e05a9978213060db80a106c010c7 /ctdb | |
| parent | 26b19401622d751a56d9a8df4d4102b5df1f6519 (diff) | |
| download | samba-99fa3a343f61213cf4cf214751ede0a7568f3167.tar.gz | |
ctdb-tests: Remove tests for old event daemon
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb')
25 files changed, 0 insertions, 1296 deletions
diff --git a/ctdb/tests/ctdb_eventd/README b/ctdb/tests/ctdb_eventd/README deleted file mode 100644 index 742b2c5cc82..00000000000 --- a/ctdb/tests/ctdb_eventd/README +++ /dev/null @@ -1 +0,0 @@ -Unit tests for event daemon diff --git a/ctdb/tests/ctdb_eventd/eventd_001.sh b/ctdb/tests/ctdb_eventd/eventd_001.sh deleted file mode 100755 index bd8cc17ae1a..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_001.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "empty eventscript directory" - -setup_eventd - -required_result 0 <<EOF -No event scripts found -EOF -simple_test script list - -required_result 0 <<EOF -EOF -simple_test run monitor 30 - -required_result 0 <<EOF -EOF -simple_test status monitor - -required_result 0 <<EOF -EOF -simple_test status monitor lastpass - -required_result 0 <<EOF -Event monitor has never failed -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_002.sh b/ctdb/tests/ctdb_eventd/eventd_002.sh deleted file mode 100755 index 1e86bdfda0c..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_002.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "eventscript directory with random files" - -setup_eventd - -touch "$eventd_scriptdir/README.script" - -cat > "$eventd_scriptdir/a.script" <<EOF -#!/bin/sh - -exit 1 -EOF - -required_result 0 <<EOF -No event scripts found -EOF -simple_test script list - -required_result 22 <<EOF -Script name README is invalid -EOF -simple_test script enable README - -required_result 22 <<EOF -Script name a is invalid -EOF -simple_test script disable a - -required_result 2 <<EOF -Script 00.test does not exist -EOF -simple_test script enable 00.test - -required_result 0 <<EOF -EOF -simple_test run monitor 30 - -required_result 0 <<EOF -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -EOF -simple_test status monitor lastpass - -required_result 0 <<EOF -Event monitor has never failed -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_003.sh b/ctdb/tests/ctdb_eventd/eventd_003.sh deleted file mode 100755 index 8f087f848fb..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_003.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "disabled event script" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -exit 0 -EOF - -required_result 0 <<EOF -01.test DISABLED -EOF -simple_test script list - -required_result 0 <<EOF -EOF -simple_test script disable 01.test - -required_result 0 <<EOF -EOF -simple_test script enable 01.test - -required_result 0 <<EOF -01.test -EOF -simple_test script list - -required_result 0 <<EOF -EOF -simple_test script disable 01.test - -required_result 0 <<EOF -EOF -simple_test run monitor 30 - -required_result 0 <<EOF -01.test DISABLED -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -01.test DISABLED -EOF -simple_test status monitor lastpass - -required_result 0 <<EOF -Event monitor has never failed -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_004.sh b/ctdb/tests/ctdb_eventd/eventd_004.sh deleted file mode 100755 index 31af397d1b4..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_004.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "enabled event script" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -exit 0 -EOF - -required_result 0 <<EOF -01.test DISABLED -EOF -simple_test script list - -required_result 0 <<EOF -EOF -simple_test script enable 01.test - -required_result 0 <<EOF -EOF -simple_test script enable 01.test - -required_result 0 <<EOF -EOF -simple_test run monitor 30 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status monitor lastpass - -required_result 0 <<EOF -Event monitor has never failed -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_005.sh b/ctdb/tests/ctdb_eventd/eventd_005.sh deleted file mode 100755 index 0097bc5e24e..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_005.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "failing event script" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -exit 1 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -required_result 1 <<EOF -Failed to run event monitor, result=1 -EOF -simple_test run monitor 30 - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_006.sh b/ctdb/tests/ctdb_eventd/eventd_006.sh deleted file mode 100755 index 09d8813aa4e..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_006.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "timing out event script" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -sleep 10 -exit 0 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -required_result 62 <<EOF -Event monitor timed out -EOF -simple_test run monitor 5 - -required_result 62 <<EOF -01.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 62 <<EOF -01.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_007.sh b/ctdb/tests/ctdb_eventd/eventd_007.sh deleted file mode 100755 index 2c990461df9..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_007.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "capture event script output" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo "args: \$*" -exit 1 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -required_result 1 <<EOF -Failed to run event monitor, result=1 -EOF -simple_test run monitor 30 - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: args: monitor -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: args: monitor -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_011.sh b/ctdb/tests/ctdb_eventd/eventd_011.sh deleted file mode 100755 index d05de531901..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_011.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "multiple events" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo "args: \$*" - -case "\$1" in -startup) - exit 0 - ;; -monitor) - exit 1 - ;; -esac -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -required_result 0 <<EOF -EOF -simple_test run startup 30 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastpass - -required_result 0 <<EOF -Event startup has never failed -EOF -simple_test status startup lastfail - -required_result 1 <<EOF -Failed to run event monitor, result=1 -EOF -simple_test run monitor 30 - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: args: monitor -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: args: monitor -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_012.sh b/ctdb/tests/ctdb_eventd/eventd_012.sh deleted file mode 100755 index 9154d8fd2a1..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_012.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "cancel new monitor event" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -sleep 5 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -required_result 0 <<EOF -EOF -simple_test_background run startup 30 - -required_result 125 <<EOF -Event monitor got cancelled -EOF -simple_test run monitor 30 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastpass - -required_result 0 <<EOF -Event startup has never failed -EOF -simple_test status startup lastfail - -required_result 0 <<EOF -Event monitor has never run -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 0 <<EOF -Event monitor has never failed -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_013.sh b/ctdb/tests/ctdb_eventd/eventd_013.sh deleted file mode 100755 index d80ecf007cf..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_013.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "cancel running monitor event" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -sleep 5 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -required_result 125 <<EOF -Event monitor got cancelled -EOF -simple_test_background run monitor 30 - -required_result 0 <<EOF -EOF -simple_test run startup 30 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastpass - -required_result 0 <<EOF -Event startup has never failed -EOF -simple_test status startup lastfail - -required_result 0 <<EOF -Event monitor has never run -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 0 <<EOF -Event monitor has never failed -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_014.sh b/ctdb/tests/ctdb_eventd/eventd_014.sh deleted file mode 100755 index 56e728cfa06..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_014.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "queue events" - -setup_eventd - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -sleep 5 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -required_result 0 <<EOF -EOF -simple_test_background run startup 30 - -required_result 0 <<EOF -EOF -simple_test run ipreallocated 30 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status startup lastpass - -required_result 0 <<EOF -Event startup has never failed -EOF -simple_test status startup lastfail - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status ipreallocated lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status ipreallocated lastpass - -required_result 0 <<EOF -Event ipreallocated has never failed -EOF -simple_test status ipreallocated lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_021.sh b/ctdb/tests/ctdb_eventd/eventd_021.sh deleted file mode 100755 index feaf868805b..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_021.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "debug script" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -sleep 99 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -cat > "$eventd_scriptdir/debug.sh" <<EOF -#!/bin/sh - -echo "args: \$*" > "$eventd_debug" -EOF -chmod +x "$eventd_scriptdir/debug.sh" - -setup_eventd "$eventd_scriptdir/debug.sh" - -result_filter () -{ - _pid="[0-9][0-9]*" - sed -e "s| ${_pid}| PID|" -} - -required_result 62 <<EOF -Event startup timed out -EOF -simple_test run startup 5 - -# wait for debug hung script -sleep 5 - -required_result 0 <<EOF -args: PID startup -EOF -unit_test cat "$eventd_debug" diff --git a/ctdb/tests/ctdb_eventd/eventd_022.sh b/ctdb/tests/ctdb_eventd/eventd_022.sh deleted file mode 100755 index f85b435f69e..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_022.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "status output in debug script" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo "Sleeping for 99 seconds" -sleep 99 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -cat > "$eventd_scriptdir/debug.sh" <<EOF -#!/bin/sh - -( -pstree -p -a \$1 -ctdb_event "$eventd_socket" status monitor lastrun -) > "$eventd_debug" -EOF -chmod +x "$eventd_scriptdir/debug.sh" - -setup_eventd "$eventd_scriptdir/debug.sh" - -required_result 62 <<EOF -Event monitor timed out -EOF -simple_test run monitor 5 - -# wait for debug hung script -sleep 5 - -required_result 0 <<EOF -01.test.script,PID $eventd_scriptdir/01.test.script monitor - \`-sleep,PID 99 -01.test TIMEDOUT DATETIME - OUTPUT: Sleeping for 99 seconds -EOF -unit_test cat "$eventd_debug" diff --git a/ctdb/tests/ctdb_eventd/eventd_023.sh b/ctdb/tests/ctdb_eventd/eventd_023.sh deleted file mode 100755 index 9ed2f92b14c..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_023.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "redirected status output in debug script" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo "Sleeping for 99 seconds" -sleep 99 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -cat > "$eventd_scriptdir/debug.sh" <<EOF -#!/bin/sh - -exec >"$eventd_debug" 2>&1 - -ctdb_event "$eventd_socket" status monitor lastrun -EOF -chmod +x "$eventd_scriptdir/debug.sh" - -setup_eventd "$eventd_scriptdir/debug.sh" - -required_result 62 <<EOF -Event monitor timed out -EOF -simple_test run monitor 5 - -# wait for debug hung script -sleep 5 - -required_result 0 <<EOF -01.test TIMEDOUT DATETIME - OUTPUT: Sleeping for 99 seconds -EOF -unit_test cat "$eventd_debug" diff --git a/ctdb/tests/ctdb_eventd/eventd_024.sh b/ctdb/tests/ctdb_eventd/eventd_024.sh deleted file mode 100755 index 38ebfa91dc1..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_024.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "process terminated after debug" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo "Sleeping for 99 seconds" -sleep 99 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -cat > "$eventd_scriptdir/debug.sh" <<EOF -#!/bin/sh - -echo \$1 > "$eventd_debug" -EOF -chmod +x "$eventd_scriptdir/debug.sh" - -setup_eventd "$eventd_scriptdir/debug.sh" - -result_filter() -{ - _pid="[0-9][0-9]*" - sed -e "s|${_pid}|PID|" -} - -required_result 62 <<EOF -Event monitor timed out -EOF -simple_test run monitor 5 - -# wait for debug hung script -sleep 5 - -required_result 0 <<EOF -PID -EOF -unit_test cat "$eventd_debug" - -pid=$(cat "$eventd_debug") - -required_result 0 <<EOF -EOF -unit_test pstree -p -a "$pid" diff --git a/ctdb/tests/ctdb_eventd/eventd_031.sh b/ctdb/tests/ctdb_eventd/eventd_031.sh deleted file mode 100755 index ab7d7adc5e0..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_031.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "multiple scripts" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -sleep 1 -EOF - -cp "$eventd_scriptdir/01.test.script" "$eventd_scriptdir/02.test.script" -cp "$eventd_scriptdir/01.test.script" "$eventd_scriptdir/03.test.script" - -setup_eventd - -required_result 0 <<EOF -01.test DISABLED -02.test DISABLED -03.test DISABLED -EOF -simple_test script list - -required_result 0 <<EOF -EOF -simple_test script enable 01.test - -required_result 0 <<EOF -EOF -simple_test script enable 02.test - -required_result 0 <<EOF -EOF -simple_test script enable 03.test - -required_result 0 <<EOF -01.test -02.test -03.test -EOF -simple_test script list - -required_result 0 <<EOF -EOF -simple_test run monitor 30 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -02.test OK DURATION DATETIME -03.test OK DURATION DATETIME -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -02.test OK DURATION DATETIME -03.test OK DURATION DATETIME -EOF -simple_test status monitor lastpass - -required_result 0 <<EOF -Event monitor has never failed -EOF -simple_test status monitor lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_032.sh b/ctdb/tests/ctdb_eventd/eventd_032.sh deleted file mode 100755 index 96b4d54273a..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_032.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "failures with multiple scripts" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -case "\$1" in -startup) - exit 1 - ;; -monitor|ipreallocated) - exit 0 - ;; -esac - -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -cat > "$eventd_scriptdir/02.test.script" <<EOF -#!/bin/sh - -case "\$1" in -monitor) - exit 2 - ;; -startup|ipreallocated) - exit 0 - ;; -esac - -EOF -chmod +x "$eventd_scriptdir/02.test.script" - -cat > "$eventd_scriptdir/03.test.script" <<EOF -#!/bin/sh - -case "\$1" in -ipreallocated) - exit 3 - ;; -startup|monitor) - exit 0 - ;; -esac - -EOF -chmod +x "$eventd_scriptdir/03.test.script" - -setup_eventd - -required_result 1 <<EOF -Failed to run event startup, result=1 -EOF -simple_test run startup 30 - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status startup - -required_result 0 <<EOF -Event startup has never passed -EOF -simple_test status startup lastpass - -required_result 1 <<EOF -01.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status startup lastfail - -required_result 2 <<EOF -Failed to run event monitor, result=2 -EOF -simple_test run monitor 30 - -required_result 2 <<EOF -01.test OK DURATION DATETIME -02.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status monitor - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 2 <<EOF -01.test OK DURATION DATETIME -02.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status monitor lastfail - -required_result 3 <<EOF -Failed to run event ipreallocated, result=3 -EOF -simple_test run ipreallocated 30 - -required_result 3 <<EOF -01.test OK DURATION DATETIME -02.test OK DURATION DATETIME -03.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status ipreallocated - -required_result 0 <<EOF -Event ipreallocated has never passed -EOF -simple_test status ipreallocated lastpass - -required_result 3 <<EOF -01.test OK DURATION DATETIME -02.test OK DURATION DATETIME -03.test ERROR DURATION DATETIME - OUTPUT: -EOF -simple_test status ipreallocated lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_033.sh b/ctdb/tests/ctdb_eventd/eventd_033.sh deleted file mode 100755 index 724bdb3d973..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_033.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "timeouts with multiple scripts" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -case "\$1" in -startup) - sleep 10 - ;; -monitor|ipreallocated) - exit 0 - ;; -esac - -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -cat > "$eventd_scriptdir/02.test.script" <<EOF -#!/bin/sh - -case "\$1" in -monitor) - sleep 10 - ;; -startup|ipreallocated) - exit 0 - ;; -esac - -EOF -chmod +x "$eventd_scriptdir/02.test.script" - -cat > "$eventd_scriptdir/03.test.script" <<EOF -#!/bin/sh - -case "\$1" in -ipreallocated) - sleep 10 - ;; -startup|monitor) - exit 0 - ;; -esac - -EOF -chmod +x "$eventd_scriptdir/03.test.script" - -setup_eventd - -required_result 62 <<EOF -Event startup timed out -EOF -simple_test run startup 5 - -required_result 62 <<EOF -01.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status startup lastrun - -required_result 0 <<EOF -Event startup has never passed -EOF -simple_test status startup lastpass - -required_result 62 <<EOF -01.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status startup lastfail - -required_result 62 <<EOF -Event monitor timed out -EOF -simple_test run monitor 5 - -required_result 62 <<EOF -01.test OK DURATION DATETIME -02.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status monitor lastrun - -required_result 0 <<EOF -Event monitor has never passed -EOF -simple_test status monitor lastpass - -required_result 62 <<EOF -01.test OK DURATION DATETIME -02.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status monitor lastfail - -required_result 62 <<EOF -Event ipreallocated timed out -EOF -simple_test run ipreallocated 5 - -required_result 62 <<EOF -01.test OK DURATION DATETIME -02.test OK DURATION DATETIME -03.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status ipreallocated lastrun - -required_result 0 <<EOF -Event ipreallocated has never passed -EOF -simple_test status ipreallocated lastpass - -required_result 62 <<EOF -01.test OK DURATION DATETIME -02.test OK DURATION DATETIME -03.test TIMEDOUT DATETIME - OUTPUT: -EOF -simple_test status ipreallocated lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_041.sh b/ctdb/tests/ctdb_eventd/eventd_041.sh deleted file mode 100755 index 581f30c4d67..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_041.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "takeip event" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo \$* -if [ \$# -ne 4 ] ; then - echo "Wrong number of arguments" - exit 2 -fi -exit 0 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -setup_eventd - -required_result 1 <<EOF -Insufficient arguments for event takeip -EOF -simple_test run takeip 30 - -required_result 0 <<EOF -Event takeip has never run -EOF -simple_test status takeip lastrun - -required_result 0 <<EOF -EOF -simple_test run takeip 30 eth0 192.168.1.1 24 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status takeip lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status takeip lastpass - -required_result 0 <<EOF -Event takeip has never failed -EOF -simple_test status takeip lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_042.sh b/ctdb/tests/ctdb_eventd/eventd_042.sh deleted file mode 100755 index c99832b8019..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_042.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "releaseip event" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo \$* -if [ \$# -ne 4 ] ; then - echo "Wrong number of arguments" - exit 2 -fi -exit 0 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -setup_eventd - -required_result 1 <<EOF -Insufficient arguments for event releaseip -EOF -simple_test run releaseip 30 - -required_result 0 <<EOF -Event releaseip has never run -EOF -simple_test status releaseip lastrun - -required_result 0 <<EOF -EOF -simple_test run releaseip 30 eth0 192.168.1.1 24 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status releaseip lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status releaseip lastpass - -required_result 0 <<EOF -Event releaseip has never failed -EOF -simple_test status releaseip lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_043.sh b/ctdb/tests/ctdb_eventd/eventd_043.sh deleted file mode 100755 index 6ca409ff3d9..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_043.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "updateip event" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo \$* -if [ \$# -ne 5 ] ; then - echo "Wrong number of arguments" - exit 2 -fi -exit 0 -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -setup_eventd - -required_result 1 <<EOF -Insufficient arguments for event updateip -EOF -simple_test run updateip 30 - -required_result 0 <<EOF -Event updateip has never run -EOF -simple_test status updateip lastrun - -required_result 0 <<EOF -EOF -simple_test run updateip 30 eth0 eth1 192.168.1.1 24 - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status updateip lastrun - -required_result 0 <<EOF -01.test OK DURATION DATETIME -EOF -simple_test status updateip lastpass - -required_result 0 <<EOF -Event updateip has never failed -EOF -simple_test status updateip lastfail diff --git a/ctdb/tests/ctdb_eventd/eventd_051.sh b/ctdb/tests/ctdb_eventd/eventd_051.sh deleted file mode 100755 index 8993984aebc..00000000000 --- a/ctdb/tests/ctdb_eventd/eventd_051.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "logging check" - -cat > "$eventd_scriptdir/01.test.script" <<EOF -#!/bin/sh - -echo "Running event \$1" -EOF -chmod +x "$eventd_scriptdir/01.test.script" - -setup_eventd - -required_result 0 <<EOF -EOF -simple_test run monitor 30 - -required_result 0 <<EOF -ctdb-eventd[PID]: 01.test: Running event monitor -EOF -unit_test grep "01.test:" "$eventd_logfile" diff --git a/ctdb/tests/ctdb_eventd/scripts/local.sh b/ctdb/tests/ctdb_eventd/scripts/local.sh deleted file mode 100644 index c8f7775f554..00000000000 --- a/ctdb/tests/ctdb_eventd/scripts/local.sh +++ /dev/null @@ -1,136 +0,0 @@ -# Hey Emacs, this is a -*- shell-script -*- !!! :-) - -. "${TEST_SCRIPTS_DIR}/script_install_paths.sh" - -PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR" - -# Augment PATH with stubs/ directory. - -if "$TEST_VERBOSE" ; then - debug () { echo "$@" ; } -else - debug () { : ; } -fi - -eventd_socket="${TEST_VAR_DIR}/eventd.socket.$$" -eventd_pidfile="${TEST_VAR_DIR}/eventd.pid.$$" -eventd_logfile="${TEST_VAR_DIR}/eventd.log.$$" -eventd_debug=$(mktemp --tmpdir="$TEST_VAR_DIR") -eventd_scriptdir=$(mktemp -d --tmpdir="$TEST_VAR_DIR") - -define_test () -{ - _f=$(basename "$0" ".sh") - - printf "%-28s - %s\n" "$_f" "$1" -} - -cleanup_eventd () -{ - debug "Cleaning up eventd" - - pid=$(cat "$eventd_pidfile" 2>/dev/null || echo) - if [ -n "$pid" ] ; then - kill $pid || true - rm -f "$eventd_pidfile" - fi - rm -f "$eventd_socket" - rm -f "$eventd_logfile" - rm -f "$eventd_debug" - rm -rf "$eventd_scriptdir" -} - -setup_eventd () -{ - echo "Setting up eventd" - - if [ -n "$1" ]; then - extra_args="-D $1" - fi - - $VALGRIND ctdb_eventd -s "$eventd_socket" \ - -p "$eventd_pidfile" \ - -e "$eventd_scriptdir" \ - -l "file:" -d "DEBUG" $extra_args 2>&1 | tee "$eventd_logfile" & - # Wait till eventd is running - wait_until 10 test -S "$eventd_socket" || \ - die "ctdb_eventd failed to start" - - test_cleanup cleanup_eventd -} - -simple_test_background () -{ - background_log=$(mktemp --tmpdir="$TEST_VAR_DIR") - background_status=$(mktemp --tmpdir="$TEST_VAR_DIR") - background_running=1 - - ( - (unit_test ctdb_event "$eventd_socket" "$@") \ - > "$background_log" 2>&1 - echo $? > "$background_status" - ) & - background_pid=$! -} - -background_wait () -{ - [ -n "$background_running" ] || return - - count=0 - while [ ! -s "$background_status" -a $count -lt 30 ] ; do - count=$(( $count + 1 )) - sleep 1 - done - - if [ ! -s "$background_status" ] ; then - kill -9 "$background_pid" - echo TIMEOUT > "$background_status" - fi -} - -background_output () -{ - [ -n "$background_running" ] || return - - bg_status=$(cat "$background_status") - rm -f "$background_status" - echo "--- Background ---" - if [ "$bg_status" = "TIMEOUT" ] ; then - echo "Background process did not complete" - bg_status=1 - else - cat "$background_log" - rm -f "$background_log" - fi - echo "--- Background ---" - unset background_running - [ $bg_status -eq 0 ] || exit $bg_status -} - -simple_test () -{ - (unit_test ctdb_event "$eventd_socket" "$@") - status=$? - - background_wait - background_output - - [ $status -eq 0 ] || exit $status -} - -result_filter () -{ - _duration="\<[0-9][0-9]*\.[0-9][0-9][0-9]\>" - _day="\(Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun\)" - _month="\(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec\)" - _date="\( [0-9]\|[0-9][0-9]\)" - _time="[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" - _year="[0-9][0-9][0-9][0-9]" - _datetime="${_day} ${_month} ${_date} ${_time} ${_year}" - _pid="[0-9][0-9]*" - sed -e "s#${_duration}#DURATION#" \ - -e "s#${_datetime}#DATETIME#" \ - -e "s#,${_pid}#,PID#" \ - -e "s#\[${_pid}\]#[PID]#" -} diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh index 0dc9313b8d5..f1268a5f404 100755 --- a/ctdb/tests/run_tests.sh +++ b/ctdb/tests/run_tests.sh @@ -261,7 +261,6 @@ echo "TEST_VAR_DIR=$TEST_VAR_DIR" export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts" unit_tests=" - ctdb_eventd cunit eventd eventscripts |