diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-07-07 13:46:34 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-07-11 11:48:38 +0200 |
| commit | a3610d1cbcebb0fe81505d42276604804a112d9a (patch) | |
| tree | 9fbcb55a3c526ebe154dec82ff9d845eef0e9147 /ctdb | |
| parent | f029e2a76debaf663c40537bd850918802bfd1e0 (diff) | |
| download | samba-a3610d1cbcebb0fe81505d42276604804a112d9a.tar.gz | |
ctdb-tests: Clean up define_test() for event scripts
Factor out a little bit of common code. More coming.
Most of this is whitespace changes.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 63 |
1 files changed, 35 insertions, 28 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 078ec8868b8..28fc2363a78 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -446,44 +446,51 @@ setup () # Set some globals and print the summary. define_test () { - desc="$1" + desc="$1" - _f=$(basename "$0" ".sh") + _f=$(basename "$0" ".sh") - # Remaining format should be NN.service.event.NNN or NN.service.NNN: - _num="${_f##*.}" - _f="${_f%.*}" + # Remaining format should be NN.script.event.NUM or + # NN.script.NUM or script.NUM: + _num="${_f##*.}" + _f="${_f%.*}" - case "$_f" in - [0-9][0-9].*.*) - script="${_f%.*}.script" - event="${_f##*.}" - script_dir="${CTDB_BASE}/events/legacy" - ;; + case "$_f" in [0-9][0-9].*) - script="${_f}.script" - unset event - script_dir="${CTDB_BASE}/events/legacy" - ;; + case "$_f" in + [0-9][0-9].*.*) + script="${_f%.*}.script" + event="${_f##*.}" + ;; + [0-9][0-9].*) + script="${_f}.script" + unset event + ;; + esac + _subdir="events/legacy" + script_dir="${CTDB_BASE}/${_subdir}" + ;; *) - script="${_f%.*}" - unset event - script_dir="${CTDB_BASE}" - esac + script="${_f%.*}" + unset event + script_dir="${CTDB_BASE}" + esac - [ -r "${script_dir}/${script}" ] || \ - die "Internal error - unable to find script \"${script_dir}/${script}\"" + _s="${script_dir}/${script}" + [ -r "$_s" ] || \ + die "Internal error - unable to find script \"${_s}\"" - script_short="${script%.script}" + script_short="${script%.script}" - printf "%-17s %-10s %-4s - %s\n\n" "$script_short" "$event" "$_num" "$desc" + printf "%-17s %-10s %-4s - %s\n\n" \ + "$script_short" "$event" "$_num" "$desc" - _f="${TEST_SUBDIR}/scripts/${script_short}.sh" - if [ -r "$_f" ] ; then - . "$_f" - fi + _f="${TEST_SUBDIR}/scripts/${script_short}.sh" + if [ -r "$_f" ] ; then + . "$_f" + fi - ctdb_set_pnn 0 + ctdb_set_pnn 0 } # Run an eventscript once. The test passes if the return code and |