Merge pull request #162 from ionut-arm/integr-tests

Add integration test

Author: ionut-arm

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Build the container
         run: docker build -t all-providers e2e_tests/provider_cfg/all
       - name: Run the container to execute the test script
-        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec all-providers /tmp/parsec/tests/ci.sh all
+        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec all-providers /tmp/parsec/ci.sh all
 
   mbed-crypto-provider:
     name: Integration tests using Mbed Crypto provider
@@ -21,7 +21,7 @@ jobs:
       - name: Build the container
         run: docker build -t mbed-crypto-provider e2e_tests/provider_cfg/mbed-crypto
       - name: Run the container to execute the test script
-        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec mbed-crypto-provider /tmp/parsec/tests/ci.sh mbed-crypto
+        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec mbed-crypto-provider /tmp/parsec/ci.sh mbed-crypto
 
   pkcs11-provider:
     name: Integration tests using PKCS 11 provider
@@ -31,7 +31,7 @@ jobs:
       - name: Build the container
         run: docker build -t pkcs11-provider e2e_tests/provider_cfg/pkcs11
       - name: Run the container to execute the test script
-        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec pkcs11-provider /tmp/parsec/tests/ci.sh pkcs11
+        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec pkcs11-provider /tmp/parsec/ci.sh pkcs11
 
   tpm-provider:
     name: Integration tests using TPM provider
@@ -41,4 +41,4 @@ jobs:
       - name: Build the container
         run: docker build -t tpm-provider e2e_tests/provider_cfg/tpm
       - name: Run the container to execute the test script
-        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec tpm-provider /tmp/parsec/tests/ci.sh tpm
+        run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec tpm-provider /tmp/parsec/ci.sh tpm

.travis.yml

@@ -7,14 +7,14 @@ services:
 jobs:
   include:
     - name: "Integration tests using Mbed Crypto provider"
-      env: DOCKER_IMAGE_NAME=mbed-crypto-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/mbed-crypto SCRIPT="tests/ci.sh mbed-crypto"
+      env: DOCKER_IMAGE_NAME=mbed-crypto-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/mbed-crypto SCRIPT="ci.sh mbed-crypto"
     - name: "Integration tests using PKCS 11 provider"
-      env: DOCKER_IMAGE_NAME=pkcs11-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/pkcs11 SCRIPT="tests/ci.sh pkcs11"
+      env: DOCKER_IMAGE_NAME=pkcs11-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/pkcs11 SCRIPT="ci.sh pkcs11"
   # PKCS11 tests are failing because of unidentified issues.
   # See https://github.com/parallaxsecond/parsec/issues/116
   allow_failures:
-    - env: DOCKER_IMAGE_NAME=mbed-crypto-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/mbed-crypto SCRIPT="tests/ci.sh mbed-crypto"
-    - env: DOCKER_IMAGE_NAME=pkcs11-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/pkcs11 SCRIPT="tests/ci.sh pkcs11"
+    - env: DOCKER_IMAGE_NAME=mbed-crypto-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/mbed-crypto SCRIPT="ci.sh mbed-crypto"
+    - env: DOCKER_IMAGE_NAME=pkcs11-provider DOCKER_IMAGE_PATH=e2e_tests/provider_cfg/pkcs11 SCRIPT="ci.sh 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

Cargo.lock

@@ -40,13 +40,8 @@ derivative = "2.1.1"
 version = "3.0.0"
 
 [dev-dependencies]
-num_cpus = "1.10.1"
-picky-asn1-der = "0.2.2"
-picky-asn1 = "0.2.1"
-serde = { version = "1.0", features = ["derive"] }
-sha2 = "0.8.1"
-parsec-client = "0.2.0"
-parsec-interface = { version = "0.14.0", features = ["testing"] }
+ring = "0.16.12"
+lazy_static = "1.4.0"
 
 [build-dependencies]
 bindgen = "0.50.0"

Cargo.toml

@@ -31,7 +31,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] [--no-stress-test] PROVIDER_NAME
+Usage: ./ci.sh [--no-cargo-clean] [--no-stress-test] PROVIDER_NAME
 where PROVIDER_NAME can be one of:
     - mbed-crypto
     - pkcs11
@@ -110,12 +110,13 @@ if rustup component list | grep -q clippy; then
     cargo clippy --all-targets $FEATURES -- -D clippy::all -D clippy::cargo
 fi
 
-echo "Unit tests"
-RUST_BACKTRACE=1 cargo test --lib $FEATURES
-echo "Doc tests"
-RUST_BACKTRACE=1 cargo test --doc $FEATURES
+echo "Unit, doc and integration tests"
+RUST_BACKTRACE=1 cargo test $FEATURES
 
-echo "Start Parsec for integration tests"
+# Removing any mappings left over from integration tests
+rm -rf mappings/
+
+echo "Start Parsec for end-to-end tests"
 RUST_LOG=info RUST_BACKTRACE=1 cargo run $FEATURES -- --config $CONFIG_PATH &
 PARSEC_PID=$!
 # Sleep time needed to make sure Parsec is ready before launching the tests.