Merge pull request #145 from hug-dev/remove-stress-tests-pkcs11

Remove stress test on Travis CI for PKCS 11

Author: hug-dev

.travis.yml

@@ -10,12 +10,14 @@ jobs:
       env:
       - DOCKER_IMAGE_NAME=mbed-crypto-provider
       - DOCKER_IMAGE_PATH=tests/per_provider/provider_cfg/mbed-crypto
-      - SCRIPT="tests/ci.sh mbed-crypto"
+      # Stress test fails on Travis CI, see #116
+      - SCRIPT="tests/ci.sh --no-stress-test mbed-crypto"
     - name: "Integration tests using PKCS 11 provider"
       env:
       - DOCKER_IMAGE_NAME=pkcs11-provider
       - DOCKER_IMAGE_PATH=tests/per_provider/provider_cfg/pkcs11
-      - SCRIPT="tests/ci.sh pkcs11"
+      # Stress test fails on Travis CI, see #116
+      - SCRIPT="tests/ci.sh --no-stress-test pkcs11"
 script:
 - docker build -t $DOCKER_IMAGE_NAME $DOCKER_IMAGE_PATH
 - docker run -v $(pwd):/tmp/parsec -w /tmp/parsec $DOCKER_IMAGE_NAME /tmp/parsec/$SCRIPT

tests/ci.sh

@@ -45,7 +45,7 @@ It is meant to be executed inside one of the container
 which Dockerfiles are in tests/per_provider/provider_cfg/*/
 or tests/all_providers/
 
-Usage: ./tests/ci.sh [--no-cargo-clean] PROVIDER_NAME
+Usage: ./tests/ci.sh [--no-cargo-clean] [--no-stress-test] PROVIDER_NAME
 where PROVIDER_NAME can be one of:
     - mbed-crypto
     - pkcs11
@@ -62,12 +62,16 @@ error_msg () {
 
 # Parse arguments
 NO_CARGO_CLEAN=
+NO_STRESS_TEST=
 PROVIDER_NAME=
 while [ "$#" -gt 0 ]; do
     case "$1" in
         --no-cargo-clean )
             NO_CARGO_CLEAN="True"
         ;;
+        --no-stress-test )
+            NO_STRESS_TEST="True"
+        ;;
         mbed-crypto | pkcs11 | tpm | all )
             if [ -n "$PROVIDER_NAME" ]; then
                 error_msg "Only one provider name must be given"
@@ -172,18 +176,20 @@ else
     echo "Execute persistent test, after the reload"
     RUST_BACKTRACE=1 cargo test $FEATURES persistent_after
 
-    echo "Shutdown Parsec"
-    kill $PARSEC_PID
-    # Sleep time needed to make sure Parsec is killed.
-    sleep 2
-
-    echo "Start Parsec for stress tests"
-    # Change the log level for the stress tests because logging is limited on the
-    # CI servers.
-    RUST_LOG=error RUST_BACKTRACE=1 cargo run $FEATURES -- --config $CONFIG_PATH &
-    PARSEC_PID=$!
-    sleep 5
-
-    echo "Execute stress tests"
-    RUST_BACKTRACE=1 cargo test $FEATURES stress_test
+    if [ -z "$NO_STRESS_TEST" ]; then
+        echo "Shutdown Parsec"
+        kill $PARSEC_PID
+        # Sleep time needed to make sure Parsec is killed.
+        sleep 2
+
+        echo "Start Parsec for stress tests"
+        # Change the log level for the stress tests because logging is limited on the
+        # CI servers.
+        RUST_LOG=error RUST_BACKTRACE=1 cargo run $FEATURES -- --config $CONFIG_PATH &
+        PARSEC_PID=$!
+        sleep 5
+
+        echo "Execute stress tests"
+        RUST_BACKTRACE=1 cargo test $FEATURES stress_test
+	fi
 fi

tests/per_provider/provider_cfg/mbed-crypto/config.toml

@@ -4,7 +4,9 @@ log_timestamp = false
 
 [listener]
 listener_type = "DomainSocket"
-timeout = 200 # in milliseconds
+# The timeout needs to be smaller than the test client timeout (five seconds) as it is testing
+# that the service does not hang for very big values of body or authentication length.
+timeout = 3000 # in milliseconds
 
 [[key_manager]]
 name = "on-disk-manager"

tests/per_provider/provider_cfg/pkcs11/config.toml

@@ -4,7 +4,9 @@ log_timestamp = false
 
 [listener]
 listener_type = "DomainSocket"
-timeout = 200 # in milliseconds
+# The timeout needs to be smaller than the test client timeout (five seconds) as it is testing
+# that the service does not hang for very big values of body or authentication length.
+timeout = 3000 # in milliseconds
 
 [[key_manager]]
 name = "on-disk-manager"

tests/per_provider/provider_cfg/tpm/config.toml

@@ -4,7 +4,9 @@ log_timestamp = false
 
 [listener]
 listener_type = "DomainSocket"
-timeout = 200 # in milliseconds
+# The timeout needs to be smaller than the test client timeout (five seconds) as it is testing
+# that the service does not hang for very big values of body or authentication length.
+timeout = 3000 # in milliseconds
 
 [[key_manager]]
 name = "on-disk-manager"