Test framework improvement (#1128)

test/tests/test_fn_update/test_secret_update.sh

@@ -1,25 +1,26 @@
 #!/bin/bash
 
 set -euo pipefail
+source $(dirname $0)/../../utils.sh
 
-source $(dirname $0)/fnupdate_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)/../../..
 
-env=python-$(date +%N)
-fn_name=hellopython-$(date +%N)
+env=python-$TEST_ID
+fn_name=hellopython-$TEST_ID
 
-old_secret=old-secret-$(date +%N)
-new_secret=new-secret-$(date +%N)
+old_secret=old-secret-$TEST_ID
+new_secret=new-secret-$TEST_ID
 
 cleanup() {
     log "Cleaning up..."
-    fission env delete --name $env || true
-    kubectl delete secret ${old_secret} -n default || true
-    kubectl delete secret ${new_secret} -n default || true
-    fission spec destroy || true
-    rm -rf specs || true
-    rm secret.py || true
+    clean_resource_by_id $TEST_ID
+    rm -rf $tmp_dir
 }
 
 if [ -z "${TEST_NOCLEANUP:-}" ]; then
@@ -28,19 +29,22 @@ else
     log "TEST_NOCLEANUP is set; not cleaning up test artifacts afterwards."
 fi
 
-cp $ROOT/test/tests/test_secret_cfgmap/secret.py.template secret.py
-sed -i "s/{{ FN_SECRET }}/${old_secret}/g" secret.py
+sed "s/{{ FN_SECRET }}/${old_secret}/g" \
+    $ROOT/test/tests/test_secret_cfgmap/secret.py.template \
+    > $tmp_dir/secret.py
 
 log "Creating env $env"
-fission env create --name $env --image fission/python-env
+fission env create --name $env --image $PYTHON_RUNTIME_IMAGE
 
 log "Creating secret $old_secret"
 kubectl create secret generic ${old_secret} --from-literal=TEST_KEY="TESTVALUE" -n default
 
 log "Creating NewDeploy function spec: $fn_name"
+pushd $tmp_dir
 fission spec init
 fission fn create --spec --name $fn_name --env $env --code secret.py --secret $old_secret --minscale 1 --maxscale 4 --executortype newdeploy
-fission spec apply ./specs/
+fission spec apply
+popd
 
 log "Creating route"
 fission route create --function ${fn_name} --url /${fn_name} --method GET
@@ -55,14 +59,17 @@ log "Creating a new secret"
 kubectl create secret generic ${new_secret} --from-literal=TEST_KEY="TESTVALUE_NEW" -n default
 
 log "Updating secret and code for the function"
-sed -i "s/${old_secret}/${new_secret}/g" secret.py
-sed -i "s/${old_secret}/${new_secret}/g" specs/function-$fn_name.yaml
+sed -i "s/${old_secret}/${new_secret}/g" $tmp_dir/secret.py
+sed -i "s/${old_secret}/${new_secret}/g" $tmp_dir/specs/function-$fn_name.yaml
 
 log "Applying function changes"
-fission spec apply ./specs/
+pushd $tmp_dir
+fission spec apply
+popd
 
 log "Waiting for changes to take effect"
 sleep 5
 
 log "Testing function for secret value"
 timeout 60 bash -c "test_fn $fn_name 'TESTVALUE_NEW'"
+log "Test PASSED"