Test framework improvement (#1128)

test/tests/test_specs/test_spec_multifile.sh

@@ -1,27 +1,38 @@
 #!/bin/bash
 
 set -euo pipefail
+source $(dirname $0)/../../utils.sh
+
+TEST_ID=$(generate_test_id)
+echo "TEST_ID = $TEST_ID"
+
+tmp_dir="/tmp/test-$TEST_ID"
+mkdir -p $tmp_dir
 
 ROOT=$(dirname $0)/../../..
 
-fn=spec-$(date +%N)
-env=python-$fn
+env=python-$TEST_ID
+fn=spec-$TEST_ID
 
 cleanup() {
-    pushd $ROOT/examples/python
-    fission spec destroy
-    rm -rf $ROOT/examples/python/specs
+    log "Cleaning up..."
+    clean_resource_by_id $TEST_ID
+    rm -rf $tmp_dir
 }
 
-trap cleanup EXIT
+if [ -z "${TEST_NOCLEANUP:-}" ]; then
+    trap cleanup EXIT
+else
+    log "TEST_NOCLEANUP is set; not cleaning up test artifacts afterwards."
+fi
 
-pushd $ROOT/examples/python
+cp -r $ROOT/examples/python/multifile $tmp_dir/
+pushd $tmp_dir
 
 fission spec init
 
 log "Creating environment spec"
-fission env create --spec --name $env --image fission/python-env --builder fission/python-builder
-fission env list | grep python
+fission env create --spec --name $env --image $PYTHON_RUNTIME_IMAGE --builder $PYTHON_BUILDER_IMAGE
 
 log "Creating function spec"
 fission fn create --spec --name $fn --env $env --deploy "multifile/*" --entrypoint main.main
@@ -37,4 +48,6 @@ fission fn test --name $fn | grep -i hello
 
 log "Destroying spec objects"
 fission spec destroy
-popd
+popd
+
+log "Test PASSED"