X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tox-integration.ini;fp=tox-integration.ini;h=c19899c19e1cfbff410210ba54bd10b8e91aa1c7;hb=75d92b757580f01bacdb745c1a1afc17f8a6f913;hp=428d14b18f271bf85634ebdc7b13d02f541df492;hpb=14d016e5551fdc203770dd8f4eac4724152e4848;p=ric-plt%2Fa1.git

diff --git a/tox-integration.ini b/tox-integration.ini
index 428d14b..c19899c 100644
--- a/tox-integration.ini
+++ b/tox-integration.ini
@@ -28,20 +28,20 @@ whitelist_externals=
     getlogs.sh
 passenv = *
 deps =
-    tavern
+    tavern == 0.34.0 # version 1.0 uses different schema; body -> json
 changedir=integration_tests
 commands_pre=
-    echo "WARNING: make sure you're running with latest docker builds!"
+    echo "WARNING: make sure you are running with latest docker builds!"
 # Fish function that builds and tags the 3 receivers. Run from integration_tests/testxappcode/
 #function a1intbuild
 #    docker build  -t a1:latest .
 #    cd integration_tests/testxappcode
-#    docker build -t testreceiver:latest . -f Dockerfile-test-receiver
+#    docker build -t testreceiver:latest  . -f Dockerfile-test-receiver
 #    docker build -t delayreceiver:latest . -f Dockerfile-delay-receiver
 #    docker build -t queryreceiver:latest . -f Dockerfile-query-receiver
 #    cd ../..
 #end
-    sleep 5
+    sleep 3
 # helm v3 is helm install [name] [chart]
     echo "linting"
     helm lint a1mediator
@@ -50,20 +50,25 @@ commands_pre=
     helm install --devel testreceiver testreceiver
     helm install --devel a1 a1mediator
     helm install --devel dbaas dbaas-service
-# wait for helm charts
+    kubectl get pods --namespace=default
+    echo "wait for pods to start"
     sleep 30
+    kubectl get pods --namespace=default
+    echo "forward ports"
     ./portforward.sh
-    sleep 2
+    echo "wait for port forward"
+    sleep 5
 commands=
-    echo "running tavern"
-# run tavern
+    echo "running tavern via pytest"
+    pytest --version
+    # --tavern-beta-new-traceback for 0.34.0; fails in 1.0.0
     pytest --tavern-beta-new-traceback test_a1.tavern.yaml
-    echo "running ab"
-# run apache bench
-    ab -n 100 -c 10 -v 4 http://localhost:10000/a1-p/healthcheck
+    echo "running apache bench (ab) on healthcheck endpoint"
+    # use -v 4 to make ab chatty
+    ab -n 100 -c 10 -v 0 http://localhost:10000/a1-p/healthcheck
 commands_post=
     echo "log collection"
-    integration_tests/getlogs.sh
+    ./getlogs.sh
     echo "teardown"
     helm delete testreceiver
     helm delete a1