Clean up integration tests

Signed-off-by: heatherlp <[email protected]>
hyperledger · Feb 18, 2020 · ceb1494 · ceb1494
1 parent 45cf6f5
commit ceb1494
Show file tree

Hide file tree

Showing 1,197 changed files with 6 additions and 923,757 deletions.
diff --git a/scripts/npm_scripts/runTape.sh b/scripts/npm_scripts/runTape.sh
@@ -14,15 +14,15 @@ runTape() {
     export HFC_LOGGING='{"debug":"test/temp/debug.log"}'
 
     # Run HSM tests by default
-    E2E_SCRIPT_SUFFIX=-hsm
+    HSM_SCRIPT=test/integration/network-e2e/e2e-hsm.js
     # If the script has been called with noHSM parameter
-    # run test/integration/network-e2e/e2e.js instead of test/integration/network-e2e/e2e-hsm.js
+    # exclude test/integration/network-e2e/e2e-hsm.js
     if [ $1 ] && [ $1 == 'noHSM' ]
     then
-        unset E2E_SCRIPT_SUFFIX
+        unset HSM_SCRIPT
     fi
 
-    # Tests have to executed in the following order
+    # Tests have to be executed in the following order
 
     # First run the ca-tests that run good/bad path member registration/enrollment scenarios
     # The remaining tests re-use the same key value store with the saved user certificates, in order to interact with the network
@@ -31,7 +31,7 @@ runTape() {
     test/integration/fabric-ca-certificate-service-tests.js \
     test/integration/fabric-ca-services-tests.js \
     test/integration/e2e.js \
-    test/integration/network-e2e/e2e${E2E_SCRIPT_SUFFIX}.js \
+    ${HSM_SCRIPT} \
     | npx tap-colorize
 }
 

diff --git a/test/fixtures/chaincode/goLang/src/github.com/example_cc1/Gopkg.lock b/test/fixtures/chaincode/goLang/src/github.com/example_cc1/Gopkg.lock
diff --git a/test/fixtures/chaincode/goLang/src/github.com/example_cc1/Gopkg.toml b/test/fixtures/chaincode/goLang/src/github.com/example_cc1/Gopkg.toml