[FABN-1489] Clean up integration tests (#134)

- Removed stuff no longer called in test/integration - Updated link to sample event handler in tutorial Signed-off-by: heatherlp <[email protected]>
hyperledger · Feb 18, 2020 · ef36a91 · ef36a91
1 parent 8d07f26
commit ef36a91
Show file tree

Hide file tree

Showing 1,198 changed files with 8 additions and 923,759 deletions.
diff --git a/docs/tutorials/transaction-commit-events.md b/docs/tutorials/transaction-commit-events.md
@@ -106,8 +106,8 @@ class MyTransactionEventHandler {
     /**
      * Cancel listening for events.
      */
-    cancelListening() { /* Your imeplementation here */ }
+    cancelListening() { /* Your implementation here */ }
 }
 ```
 
-For a complete sample plug-in event handler implementation, see [sample-transaction-event-handler.js](https://github.com/hyperledger/fabric-sdk-node/blob/master/test/integration/network-e2e/sample-transaction-event-handler.js).
+For a complete sample plug-in event handler implementation, see [sample-transaction-event-handler.ts](https://github.com/hyperledger/fabric-sdk-node/blob/master/test/ts-scenario/config/handlers/sample-transaction-event-handler.ts).
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