lib/testing: Move common functions into a scaffold (test_scaffold)

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
kubernetes · Aug 20, 2019 · 1c78f0c · 1c78f0c
1 parent 336d176
commit 1c78f0c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/lib/common_test.sh b/lib/common_test.sh
@@ -34,17 +34,7 @@ set -o errexit
 set -o pipefail
 
 TEST_run_stateful() {
-  tmpDir="$( mktemp -d )"
-  trap 'rm -rf -- "$tmpDir"' EXIT
-
-  # override some vars and func to not clutter output
-  common::timestamp() { :; }
-  # shellcheck disable=SC2034
-  PROGSTATE="${tmpDir}/whats-a-progstate-even.txt" \
-    LOGFILE="${tmpDir}/some-log-file.log" \
-    HR='' \
-    TPUT[BOLD]='' \
-    TPUT[OFF]=''
+  test_scaffold
 
   assert_equal_content \
     <( common::run_stateful --strip-args 'printf %s\n%s arg1 arg2' ) \

diff --git a/lib/testing.sh b/lib/testing.sh
@@ -35,6 +35,21 @@ test_main() {
   done
 }
 
+test_scaffold() {
+  func_name="${FUNCNAME[1]}"
+  tmpDir="$(mktemp -d "${func_name}.XXXXXX")"
+  trap 'rm -rf -- "$tmpDir"' EXIT
+
+  # override some vars and func to not clutter output
+  common::timestamp() { :; }
+  # shellcheck disable=SC2034
+  PROGSTATE="${tmpDir}/${func_name}-state.txt" \
+    LOGFILE="${tmpDir}/${func_name}.log" \
+    HR='' \
+    TPUT[BOLD]='' \
+    TPUT[OFF]=''
+}
+
 assert_equal_content() {
   local actual_file="$1"
   local expected_file="$2"