Test framework improvement (#1128)

test/tests/test_logging/test_function_logs.sh

@@ -1,19 +1,23 @@
 #!/bin/bash
 
-
 set -euo pipefail
+source $(dirname $0)/../../utils.sh
 
-ROOT=$(dirname $0)/../..
+TEST_ID=$(generate_test_id)
+echo "TEST_ID = $TEST_ID"
 
-fn=nodejs-logtest-$(date +%N)
+tmp_dir="/tmp/test-$TEST_ID"
+mkdir -p $tmp_dir
+
+ROOT=$(dirname $0)/../../..
+
+env=nodejs-$TEST_ID
+fn=nodejs-logtest-$TEST_ID
 
 cleanup() {
     log "Cleaning up..."
-    var=$(fission route list | grep $fn | awk '{print $1;}')
-    fission fn delete --name $fn || true
-    fission env delete --name nodejs || true
-    log "delete logfile" || true
-    rm "/tmp/logfile" || true
+    clean_resource_by_id $TEST_ID
+    rm -rf $tmp_dir
 }
 
 if [ -z "${TEST_NOCLEANUP:-}" ]; then
@@ -24,16 +28,16 @@ fi
 
 # Create a hello world function in nodejs, test it with an http trigger
 log "Creating nodejs env"
-fission env create --name nodejs --image fission/node-env
+fission env create --name $env --image $NODE_RUNTIME_IMAGE
 
 log "Creating function"
-fission fn create --name $fn --env nodejs --code log.js
+fission fn create --name $fn --env $env --code $(dirname $0)/log.js
 
 log "Creating route"
 fission route create --function $fn --url /$fn --method GET
 
 log "Waiting for router to catch up"
-sleep 15
+sleep 3
 
 log "Doing 4 HTTP GETs on the function's route"
 for i in 1 2 3 4
@@ -45,18 +49,18 @@ log "Grabbing logs, should have 4 calls in logs"
 
 sleep 60
 
-fission function logs --name $fn --detail > /tmp/logfile
+fission function logs --name $fn --detail > $tmp_dir/logfile
 
-size=$(wc -c </tmp/logfile)
+size=$(wc -c < $tmp_dir/logfile)
 if [ $size == 0 ]
 then
-    fission function logs --name $fn --detail > /tmp/logfile
+    fission function logs --name $fn --detail > $tmp_dir/logfile
 fi
 
 log "---function logs---"
-cat /tmp/logfile
+cat $tmp_dir/logfile
 log "------"
-num=$(grep 'log test' /tmp/logfile | wc -l)
+num=$(grep 'log test' $tmp_dir/logfile | wc -l)
 log $num logs found
 
 if [ $num -ne 4 ]