[Test] Correctly delete workspaces in performance tests (#22178)

* delete dwt object in API tests
eclipse-che · Apr 26, 2023 · 34b9a8b · 34b9a8b
1 parent 7156932
commit 34b9a8b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/tests/performance/api-tests/api-test-cpp.sh b/tests/performance/api-tests/api-test-cpp.sh
@@ -20,4 +20,4 @@ testProjectImported ${WORKSPACE_NAME} ${containerName} ${projectName}
 
 testCommand ${WORKSPACE_NAME} ${containerName} "${commandToTest}" "${expectedCommandOutput}"
 
-oc delete dw $WORKSPACE_NAME || true
+deleteWorkspace ${WORKSPACE_NAME}
diff --git a/tests/performance/api-tests/api-test-lombok.sh b/tests/performance/api-tests/api-test-lombok.sh
@@ -20,4 +20,4 @@ testProjectImported ${WORKSPACE_NAME} ${containerName} ${projectName}
 
 testCommand ${WORKSPACE_NAME} ${containerName} "${commandToTest}" "${expectedCommandOutput}"
 
-oc delete dw $WORKSPACE_NAME || true
+deleteWorkspace ${WORKSPACE_NAME}
diff --git a/tests/performance/api-tests/api-test-php.sh b/tests/performance/api-tests/api-test-php.sh
@@ -20,4 +20,4 @@ testProjectImported ${WORKSPACE_NAME} ${containerName} ${projectName}
 
 testCommand ${WORKSPACE_NAME} ${containerName} "${commandToTest}" "${expectedCommandOutput}"
 
-oc delete dw $WORKSPACE_NAME || true
+deleteWorkspace ${WORKSPACE_NAME}
diff --git a/tests/performance/api-tests/api-test-python.sh b/tests/performance/api-tests/api-test-python.sh
@@ -20,4 +20,4 @@ testProjectImported ${WORKSPACE_NAME} ${containerName} ${projectName}
 
 testCommand ${WORKSPACE_NAME} ${containerName} "${commandToTest}" "${expectedCommandOutput}"
 
-oc delete dw $WORKSPACE_NAME || true
+deleteWorkspace ${WORKSPACE_NAME}
diff --git a/tests/performance/api-tests/api-test-quarkus.sh b/tests/performance/api-tests/api-test-quarkus.sh
@@ -20,4 +20,4 @@ testProjectImported ${WORKSPACE_NAME} ${containerName} ${projectName}
 
 testCommand ${WORKSPACE_NAME} ${containerName} "${commandToTest}" "${expectedCommandOutput}"
 
-oc delete dw $WORKSPACE_NAME || true
+deleteWorkspace ${WORKSPACE_NAME}
diff --git a/tests/performance/api-tests/api-utils.sh b/tests/performance/api-tests/api-utils.sh
@@ -59,3 +59,12 @@ function testCommand() {
     exit 1
   fi
 }
+
+# This function deletes created workspace(dw and dwt objects).
+#
+# Arguments:
+#   $1: workspace name
+function deleteWorkspace() {
+  oc delete dw $1 || true
+  oc delete dwt che-code-$1 || true
+}