[FABG-751] SDK PKCS11 tests are broken with Mutual TLS

Fixed the working directory to import PKs Change-Id: I7a47327aefce9b82b103f107bd7b7e952a2d8c95 Signed-off-by: Baha Shaaban <baha.shaaban@securekey.com>
hyperledger · Sep 5, 2018 · 8113dec · 8113dec
1 parent 33034df
commit 8113dec
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -358,7 +358,6 @@ integration-tests-stable-negative: clean-tests depend-noforce populate-noforce
 .PHONY: integration-tests-stable-pkcs11
 integration-tests-stable-pkcs11: clean-tests depend-noforce populate-noforce
 	@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
-	    . $(FIXTURE_DOCKERENV_PATH)/nomutualtls-env.sh && \
 	    . $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
 		$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
 		cd $(FIXTURE_DOCKERENV_PATH) && \

diff --git a/test/scripts/integration-pkcs11.sh b/test/scripts/integration-pkcs11.sh
@@ -46,10 +46,10 @@ PKGS=($(${GO_CMD} list ${REPO}/test/integration/... 2> /dev/null | \
 # Reduce tests to changed packages.
 if [ "${TEST_CHANGED_ONLY}" = true ]; then
     # findChangedFiles assumes that the working directory contains the repo; so change to the repo directory.
-    PWD=$(pwd)
+    PWD_ORIG=$(pwd)
     cd "${GOPATH}/src/${REPO}"
     findChangedFiles
-    cd ${PWD}
+    cd ${PWD_ORIG}
 
     if [[ "${CHANGED_FILES[@]}" =~ ( |^)(test/fixtures/|test/metadata/|test/scripts/|Makefile( |$)|Gopkg.lock( |$)|ci.properties( |$)) ]]; then
         echo "Test scripts, fixtures or metadata changed - running all tests"
@@ -78,7 +78,7 @@ if [ ${#PKGS[@]} -eq 0 ]; then
     exit 0
 fi
 
-workingDir=$(pwd)
+workingDir=${GOPATH}/src/${REPO}
 declare -a PRIVATE_KEYS=($(find ${workingDir}/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION} | grep '/users/' | grep '_sk$' | tr '\n' ' '))
 PRIVATE_KEYS+=($(find ${workingDir}/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION} | grep 'User1@tls.example.com' | grep '.key$' | tr '\n' ' '))
 

diff --git a/test/scripts/integration.sh b/test/scripts/integration.sh
@@ -53,10 +53,10 @@ fi
 # Reduce tests to changed packages.
 if [ "${TEST_CHANGED_ONLY}" = true ]; then
     # findChangedFiles assumes that the working directory contains the repo; so change to the repo directory.
-    PWD=$(pwd)
+    PWD_ORIG=$(pwd)
     cd "${GOPATH}/src/${REPO}"
     findChangedFiles
-    cd ${PWD}
+    cd ${PWD_ORIG}
 
     if [[ "${CHANGED_FILES[@]}" =~ ( |^)(test/fixtures/|test/metadata/|test/scripts/|Makefile( |$)|Gopkg.lock( |$)|ci.properties( |$)) ]]; then
         echo "Test scripts, fixtures or metadata changed - running all tests"

diff --git a/test/scripts/negative.sh b/test/scripts/negative.sh
@@ -42,10 +42,10 @@ PKGS=($(${GO_CMD} list ${REPO}/test/integration/negative/... 2> /dev/null | \
 # Reduce tests to changed packages.
 if [ "${TEST_CHANGED_ONLY}" = true ]; then
     # findChangedFiles assumes that the working directory contains the repo; so change to the repo directory.
-    PWD=$(pwd)
+    PWD_ORIG=$(pwd)
     cd "${GOPATH}/src/${REPO}"
     findChangedFiles
-    cd ${PWD}
+    cd ${PWD_ORIG}
 
     if [[ "${CHANGED_FILES[@]}" =~ ( |^)(test/fixtures/|test/metadata/|test/scripts/|Makefile( |$)|Gopkg.lock( |$)|ci.properties( |$)) ]]; then
         echo "Test scripts, fixtures or metadata changed - running all tests"

diff --git a/test/scripts/unit-pkcs11.sh b/test/scripts/unit-pkcs11.sh
@@ -42,10 +42,10 @@ declare -a PKGS=(
 # Reduce unit tests to changed packages.
 if [ "$TEST_CHANGED_ONLY" = true ]; then
     # findChangedFiles assumes that the working directory contains the repo; so change to the repo directory.
-    PWD=$(pwd)
+    PWD_ORIG=$(pwd)
     cd "${GOPATH}/src/${REPO}"
     findChangedFiles
-    cd ${PWD}
+    cd ${PWD_ORIG}
 
     if [[ "${CHANGED_FILES[@]}" =~ ( |^)(test/fixtures/|test/metadata/|test/scripts/|Makefile( |$)|Gopkg.lock( |$)|gometalinter.json( |$)|ci.properties( |$)) ]]; then
         echo "Test scripts, fixtures or metadata changed - running all tests"