diff options
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/complex/90_debug_hung_script.sh | 2 | ||||
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 8 | ||||
| -rwxr-xr-x | ctdb/tests/shellcheck/event_scripts.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/simple/etc-ctdb/events/legacy/00.test (renamed from ctdb/tests/simple/etc-ctdb/events.d/00.test) | 0 | ||||
| -rw-r--r-- | ctdb/tests/simple/scripts/local_daemons.bash | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/tests/complex/90_debug_hung_script.sh b/ctdb/tests/complex/90_debug_hung_script.sh index b2518df6fdb..fc44bad8cb9 100755 --- a/ctdb/tests/complex/90_debug_hung_script.sh +++ b/ctdb/tests/complex/90_debug_hung_script.sh @@ -84,7 +84,7 @@ done <<'EOF' ===== Start of hung script debug for PID=".*", event="monitor" ===== ===== End of hung script debug for PID=".*", event="monitor" ===== pstree -p -a .*: -99\\.timeout,.* /etc/ctdb/events.d/99.timeout monitor +99\\.timeout,.* /etc/ctdb/events/legacy/99.timeout monitor *\`-sleep,.* ---- Stack trace of interesting process [0-9]*\\[sleep\\] ---- [<[0-9a-f]*>] .*sleep+.* diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index d34135eba35..3f6bf16b5bc 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -40,7 +40,7 @@ else fi setup_ctdb_base "$EVENTSCRIPTS_TESTS_VAR_DIR" "etc-ctdb" \ - events.d \ + events \ functions \ nfs-checks.d \ nfs-linux-kernel-callout \ @@ -85,7 +85,7 @@ setup_script_options () fi if [ -n "$_script" ] ; then - _options="${CTDB_BASE}/events.d/${_script}.options" + _options="${CTDB_BASE}/events/legacy/${_script}.options" else _options="${script_dir}/${script%.script}.options" fi @@ -458,12 +458,12 @@ define_test () [0-9][0-9].*.*) script="${_f%.*}" event="${_f##*.}" - script_dir="${CTDB_BASE}/events.d" + script_dir="${CTDB_BASE}/events/legacy" ;; [0-9][0-9].*) script="$_f" unset event - script_dir="${CTDB_BASE}/events.d" + script_dir="${CTDB_BASE}/events/legacy" ;; *.*) script="${_f%.*}" diff --git a/ctdb/tests/shellcheck/event_scripts.sh b/ctdb/tests/shellcheck/event_scripts.sh index b8a2b7844a3..b64c93649c8 100755 --- a/ctdb/tests/shellcheck/event_scripts.sh +++ b/ctdb/tests/shellcheck/event_scripts.sh @@ -4,4 +4,4 @@ define_test "event scripts" -shellcheck_test "${CTDB_SCRIPTS_BASE}/events.d"/[0-9][0-9].* +shellcheck_test "${CTDB_SCRIPTS_BASE}/events/"*/[0-9][0-9].* diff --git a/ctdb/tests/simple/etc-ctdb/events.d/00.test b/ctdb/tests/simple/etc-ctdb/events/legacy/00.test index 0ae09879d43..0ae09879d43 100755 --- a/ctdb/tests/simple/etc-ctdb/events.d/00.test +++ b/ctdb/tests/simple/etc-ctdb/events/legacy/00.test diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash index b3d0087888c..f681b18f6f1 100644 --- a/ctdb/tests/simple/scripts/local_daemons.bash +++ b/ctdb/tests/simple/scripts/local_daemons.bash @@ -137,7 +137,7 @@ setup_ctdb () done if $no_event_scripts ; then - rm -vf "${CTDB_BASE}/events.d/"* + rm -vf "${CTDB_BASE}/events/legacy/"* fi cat >"${CTDB_BASE}/ctdb.conf" <<EOF |