Test framework improvement (#1128)

test/tests/test_environments/test_java_env.sh

@@ -3,29 +3,26 @@
 #test:disabled
 
 set -euo pipefail
+source $(dirname $0)/../../utils.sh
+
+TEST_ID=$(generate_test_id)
+echo "TEST_ID = $TEST_ID"
 
 ROOT=$(dirname $0)/../../..
 
+env=jvm-$TEST_ID
+fn_n=jvm-hello-n-$TEST_ID
+fn_p=jvm-hello-p-$TEST_ID
+
 cleanup() {
-    fission fn delete --name hellon || true
-    fission fn delete --name hellop || true
-    fission env delete --name jvm || true
+    clean_resource_by_id $TEST_ID
 }
 
-test_fn() {
-    echo "Checking for valid response"
-
-    while true; do
-      response0=$(curl http://$FISSION_ROUTER/$1)
-      echo $response0 | grep -i $2
-      if [[ $? -eq 0 ]]; then
-        break
-      fi
-      sleep 1
-    done
-}
-
-export -f test_fn
+if [ -z "${TEST_NOCLEANUP:-}" ]; then
+    trap cleanup EXIT
+else
+    log "TEST_NOCLEANUP is set; not cleaning up test artifacts afterwards."
+fi
 
 cd $ROOT/examples/jvm/java
 
@@ -34,24 +31,25 @@ log "Creating the jar from application"
 docker run -it --rm  -v "$(pwd)":/usr/src/mymaven -w /usr/src/mymaven maven:3.5-jdk-8 mvn clean package -q
 
 log "Creating environment for Java"
-fission env create --name jvm --image gcr.io/fission-ci/jvm-env:test --version 2 --keeparchive=true
+fission env create --name $env --image $JVM_RUNTIME_IMAGE --version 2 --keeparchive=true
 
 log "Creating pool manager & new deployment function for Java"
-fission fn create --name hellop --deploy target/hello-world-1.0-SNAPSHOT-jar-with-dependencies.jar --env jvm --entrypoint io.fission.HelloWorld
-fission fn create --name hellon --deploy target/hello-world-1.0-SNAPSHOT-jar-with-dependencies.jar --env jvm --executortype newdeploy --entrypoint io.fission.HelloWorld
-trap cleanup EXIT
+fission fn create --name $fn_p --deploy target/hello-world-1.0-SNAPSHOT-jar-with-dependencies.jar --env $env --entrypoint io.fission.HelloWorld
+fission fn create --name $fn_n --deploy target/hello-world-1.0-SNAPSHOT-jar-with-dependencies.jar --env $env --executortype newdeploy --entrypoint io.fission.HelloWorld
 
 log "Creating route for pool manager function"
-fission route create --function hellop --url /hellop --method GET
+fission route create --name $fn_p --function $fn_p --url /$fn_p --method GET
 
 log "Creating route for new deployment function"
-fission route create --function hellon --url /hellon --method GET
+fission route create --name $fn_n --function $fn_n --url /$fn_n --method GET
 
 log "Waiting for router & pools to catch up"
 sleep 5
 
 log "Testing pool manager function"
-timeout 60 bash -c "test_fn hellop 'Hello'"
+timeout 60 bash -c "test_fn $fn_p 'Hello'"
 
 log "Testing new deployment function"
-timeout 60 bash -c "test_fn hellon 'Hello'"
+timeout 60 bash -c "test_fn $fn_n 'Hello'"
+
+log "Test PASSED"