make tests more robust

GDATASoftwareAG · Jun 11, 2024 · bdfde15 · bdfde15
1 parent 638143c
commit bdfde15
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -83,14 +83,14 @@ endif
 npm:
 ifeq (,$(wildcard $(CURDIR)/package.json))
 ifeq (,$(wildcard $(CURDIR)/package-lock.json))
-	npm install
+	npm install --no-audit --progress=false
 else
 	npm ci
 endif
 	cd js && $(npm) run build
 else
 ifeq (,$(wildcard $(CURDIR)/package-lock.json))
-	npm install
+	npm install --no-audit --progress=false
 else
 	npm ci
 endif

diff --git a/tests/functionality-parallel.bats b/tests/functionality-parallel.bats
@@ -11,18 +11,21 @@ setup_file() {
 @test "test admin eicar Upload" {
     RESULT=$(curl --silent -w "%{http_code}" -u admin:admin -T /tmp/eicar.com.txt http://127.0.0.1/remote.php/dav/files/admin/eicar.com.txt)
     echo "Actual: $RESULT"
+    curl --silent -q -u admin:admin -X DELETE http://127.0.0.1/remote.php/dav/files/admin/eicar.com.txt
     [[ "$RESULT" =~ "Virus EICAR-Test-File is detected in the file. Upload cannot be completed." ]]
 }
 
 @test "test admin clean Upload" {
     RESULT=$(curl -w "%{http_code}" -u admin:admin -T /tmp/clean.txt http://127.0.0.1/remote.php/dav/files/admin/clean.txt)
     echo "Actual: $RESULT"
+    curl --silent -q -u admin:admin -X DELETE http://127.0.0.1/remote.php/dav/files/admin/clean.txt
     [[ $RESULT -ge 200 && $RESULT -lt 300 ]]
 }
 
 @test "test admin pup Upload" {
     RESULT=$(curl --silent -w "%{http_code}" -u admin:admin -T /tmp/pup.exe http://127.0.0.1/remote.php/dav/files/admin/pup.exe)
     echo "Actual: $RESULT"
+    curl --silent -q -u admin:admin -X DELETE http://127.0.0.1/remote.php/dav/files/admin/pup.exe
     [[ $RESULT -ge 200 && $RESULT -lt 300 ]] 
 }
 
@@ -35,12 +38,14 @@ setup_file() {
 @test "test testuser clean Upload" {
     STATUS_CODE=$(curl --silent -w "%{http_code}" -w "%{http_code}" -u testuser:myfancysecurepassword234 -T /tmp/clean.txt http://127.0.0.1/remote.php/dav/files/testuser/clean.txt)
     echo "Actual: $RESULT"
+    curl --silent -q -u testuser:myfancysecurepassword234 -X DELETE http://127.0.0.1/remote.php/dav/files/testuser/clean.txt
     [[ $STATUS_CODE -ge 200 && $STATUS_CODE -lt 300 ]] || exit 1
 }
 
 @test "test testuser pup Upload" {
    RESULT=$(curl --silent -w "%{http_code}" -w "%{http_code}" -u testuser:myfancysecurepassword234 -T /tmp/pup.exe http://127.0.0.1/remote.php/dav/files/testuser/pup.exe)
     echo "Actual: $RESULT"
+    curl --silent -q -u testuser:myfancysecurepassword234 -X DELETE http://127.0.0.1/remote.php/dav/files/testuser/pup.exe
     [[ $RESULT -ge 200 && $RESULT -lt 300 ]] || exit 1
 }
 
diff --git a/tests/functionality-sequential.bats b/tests/functionality-sequential.bats
@@ -1,6 +1,9 @@
 #!/usr/bin/env bats
 
 setup_file() {
+    echo 'nothingwronghere' > /tmp/clean.txt
+    echo 'X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*' > /tmp/eicar.com.txt
+    curl --output /tmp/pup.exe http://amtso.eicar.org/PotentiallyUnwanted.exe
     BATS_NO_PARALLELIZE_WITHIN_FILE=true
 }
 
@@ -11,7 +14,8 @@ setup() {
 @test "test upload when vaas does not function" {
     RESULT=$(curl --silent -w "%{http_code}" -u admin:admin -T /tmp/eicar.com.txt http://127.0.0.1/remote.php/dav/files/admin/eicar.com.txt)
     echo "Actual: $RESULT"
-    [[ $RESULT -ge 200 && $RESULT -lt 300 ]] || exit 1
+    curl --silent -q -u admin:admin -X DELETE http://127.0.0.1/remote.php/dav/files/admin/eicar.com.txt
+    [[ $RESULT -ge 200 && $RESULT -lt 300 ]]
 }
 
 tearddown() {