refactor(fixtures): use subshell for running fixture methods

fixtures/README.md

@@ -29,9 +29,9 @@ setup() {
   # preparation
 }
 
-run_test() ( set -e;
+run_test() {
   # assertions
-)
+}
 
 teardown() {
   # cleanup

fixtures/test-duplicate-file-upload/test.sh

@@ -9,7 +9,7 @@ setup() {
   date +%s > unique_file2
 }
 
-run_test() ( set -e;
+run_test() {
   first_file_url=$(curl -s -F "file=@file" localhost:8000)
   test "$duplicate_content" = "$(cat upload/file.txt)"
 
@@ -22,7 +22,7 @@ run_test() ( set -e;
   first_file_url=$(curl -s -F "file=@unique_file1" localhost:8000)
   second_file_url=$(curl -s -F "file=@unique_file2" localhost:8000)
   test "$first_file_url" != "$second_file_url"
-)
+}
 
 teardown() {
   rm file unique_file1 unique_file2

fixtures/test-expiring-file-upload/test.sh

@@ -6,14 +6,14 @@ setup() {
   echo "$content" > file
 }
 
-run_test() ( set -e;
+run_test() {
   file_url=$(curl -s -F "file=@file" -H "expire:1s" localhost:8000)
   test "$content" = "$(cat upload/file.txt.*)"
   sleep 2s
 
   result="$(curl -s $file_url)"
   test "file is not found or expired :(" = "$result"
-)
+}
 
 teardown() {
   rm file

fixtures/test-file-upload/test.sh

@@ -6,12 +6,12 @@ setup() {
   echo "$content" > file
 }
 
-run_test() ( set -e;
+run_test() {
   file_url=$(curl -s -F "file=@file" localhost:8000)
   test "$file_url" = "http://localhost:8000/file.txt"
   test "$content" = "$(cat upload/file.txt)"
   test "$content" = "$(curl -s $file_url)"
-)
+}
 
 teardown() {
   rm file

fixtures/test-fixtures.sh

@@ -13,10 +13,10 @@ run_fixture() {
   SERVER_PID=$!
   trap 'kill -9 "$SERVER_PID" && wait "$SERVER_PID" 2> /dev/null' RETURN
   sleep 1
-  setup
-  run_test
+  ( set -e; setup )
+  ( set -e; run_test )
   result=$?
-  teardown
+  ( set -e; teardown )
   return "$result"
 }
 

fixtures/test-oneshot-upload/test.sh

@@ -6,14 +6,14 @@ setup() {
   echo "$content" > file
 }
 
-run_test() ( set -e;
+run_test() {
   file_url=$(curl -s -F "oneshot=@file" localhost:8000)
   test "$content" = $(curl -s "$file_url")
   test "$content" = "$(cat upload/oneshot/file.txt.*)"
 
   result="$(curl -s $file_url)"
   test "file is not found or expired :(" = "$result"
-)
+}
 
 teardown() {
   rm file

fixtures/test-path-traversal/test.sh

@@ -6,7 +6,7 @@ setup() {
   echo "$content" > file
 }
 
-run_test() ( set -e;
+run_test() {
   result=$(curl -s --path-as-is localhost:8000/.)
   test "file is not found or expired :(" = "$result"
 
@@ -15,7 +15,7 @@ run_test() ( set -e;
 
   result=$(curl -s -X POST -F "file=@file;filename=../." localhost:8000)
   test "$content" = "$(cat upload/file.txt)"
-)
+}
 
 teardown() {
   rm file

fixtures/test-remote-file-upload/test.sh

@@ -6,12 +6,12 @@ setup() {
   :;
 }
 
-run_test() ( set -e;
+run_test() {
   file_url=$(curl -s -F "remote=$url" localhost:8000)
   curl -s "$file_url" -o uploaded_file > /dev/null
   curl -s "$url" -o remote_file > /dev/null
   test "$(sha256sum uploaded_file | awk '{print $1}')" = "$(sha256sum remote_file | awk '{print $1}')"
-)
+}
 
 teardown() {
   rm uploaded_file remote_file

fixtures/test-server-auth/test.sh

@@ -7,7 +7,7 @@ setup() {
   echo "$content" > file
 }
 
-run_test() ( set -e;
+run_test() {
   result=$(curl -s -F "file=@file" localhost:8000)
   test "unauthorized" = "$result"
 
@@ -15,7 +15,7 @@ run_test() ( set -e;
   test "unauthorized" != "$result"
   test "$content" = "$(cat upload/file.txt)"
   test "$content" = "$(curl -s $result)"
-)
+}
 
 teardown() {
   rm file

fixtures/test-server-payload-limit/test.sh

@@ -7,7 +7,7 @@ setup() {
   truncate -s 11KB bigfile
 }
 
-run_test() ( set -e;
+run_test() {
   result=$(curl -s -F "file=@emptyfile" localhost:8000)
   test "invalid file size" = "$result"
 
@@ -19,7 +19,7 @@ run_test() ( set -e;
 
   result=$(curl -s -F "file=@smallfile" localhost:8000)
   test "upload limit exceeded" != "$result"
-)
+}
 
 teardown() {
   rm emptyfile smallfile normalfile bigfile

fixtures/test-url-upload/test.sh

@@ -6,13 +6,13 @@ setup() {
   :;
 }
 
-run_test() ( set -e;
+run_test() {
   curl -s -F "url=$url" localhost:8000 > /dev/null
   test "$url" = "$(cat upload/url/url)"
 
   result=$(curl -s -F "url=invalidurl" localhost:8000)
   test "relative URL without a base" = "$result"
-)
+}
 
 teardown() {
   rm -r upload