Move testing functions to single file

cinek810 · Feb 18, 2022 · 6f44221 · 6f44221
1 parent d826569
commit 6f44221
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 64 deletions.
diff --git a/tests/01-test_argument_parsing.sh b/tests/01-test_argument_parsing.sh
@@ -1,31 +1,7 @@
 #!/bin/bash -l
 
-check_message_in_output() {
-        CMD=$1
-        EXPTEXT=$2
-        echo "Check: $CMD"
-        eval "$CMD |& grep '$EXPTEXT'"
-        if [ $? -eq 0 ]
-        then
-                echo "OK: '${CMD}' returned '${EXPTEXT}'"
-        else
-                echo "FAILED: '${CMD}' didn't return '${EXPTEXT}'"
-                exit 1
-        fi
-}
 
-check_run_ok() {
-	CMD=$1
-	echo "Check: $CMD"
-	$CMD
-	if [ $? -ne 0 ]
-	then
-		echo "FAILED: ${CMD}"
-		exit 1
-	else
-		echo "OK"
-	fi
-}
+source ./testing_lib.sh
 
 #Check wrong combinations
 check_message_in_output 'ansible-deployer' 'Too few arguments'

diff --git a/tests/02-checkrun.sh b/tests/02-checkrun.sh
@@ -1,45 +1,7 @@
 #!/bin/bash -l
 
-check_message_in_output() {
-        CMD=$1
-        EXPTEXT=$2
-        echo "Check: $CMD"
-        eval "$CMD |& grep '$EXPTEXT'"
-        if [ $? -eq 0 ]
-        then
-                echo "OK: '${CMD}' returned '${EXPTEXT}'"
-        else
-                echo "FAILED: '${CMD}' didn't return '${EXPTEXT}'"
-                exit 1
-        fi
-}
 
-check_message_not_in_output() {
-        CMD=$1
-        EXPTEXT=$2
-        echo "Check: $CMD"
-        eval "$CMD |& grep '$EXPTEXT'"
-        if [ $? -eq 0 ]
-        then
-                echo "FAILED: '${CMD}' returned '${EXPTEXT}'"
-                exit 1
-        else
-                echo "OK: '${CMD}' didn't return '${EXPTEXT}'"
-        fi
-}
-
-check_run_ok() {
-	CMD=$1
-	echo "Check: $CMD"
-	$CMD
-	if [ $? -ne 0 ]
-	then
-		echo "FAILED: ${CMD}"
-		exit 1
-	else
-		echo "OK"
-	fi
-}
+source ./testing_lib.sh
 
 # Correct execution.
 check_run_ok "ansible-deployer run -t task_exec_bin_true -s prod -i testInfra"

diff --git a/tests/testing_lib.sh b/tests/testing_lib.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+check_run_ok() {
+        CMD=$1
+        echo "Check: $CMD"
+        $CMD
+        if [ $? -ne 0 ]
+        then
+                echo "FAILED: ${CMD}"
+                exit 1
+        else
+                echo "OK"
+        fi
+}
+
+check_message_in_output() {
+        CMD=$1
+        EXPTEXT=$2
+        echo "Check: $CMD"
+        eval "$CMD |& grep '$EXPTEXT'"
+        if [ $? -eq 0 ]
+        then
+                echo "OK: '${CMD}' returned '${EXPTEXT}'"
+        else
+                echo "FAILED: '${CMD}' didn't return '${EXPTEXT}'"
+                exit 1
+        fi
+}
+
+check_message_not_in_output() {
+        CMD=$1
+        EXPTEXT=$2
+        echo "Check: $CMD"
+        eval "$CMD |& grep '$EXPTEXT'"
+        if [ $? -eq 0 ]
+        then
+                echo "FAILED: '${CMD}' returned '${EXPTEXT}'"
+                exit 1
+        else
+                echo "OK: '${CMD}' didn't return '${EXPTEXT}'"
+        fi
+}
+