FAB-952 end-to-end test fails in a clean environment

reported by Eric Vaughn in slack. this is caused by end-to-end.js
using a different key value store but running after ca-tests.js
that has already enrolled the same user, causing the code to try
to re-enroll the same user with the CA, which gets rejected.

Change-Id: Ieaec5161b25866b6a333cc8cb3977f00523f910e
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>

build/tasks/test.js

@@ -12,7 +12,12 @@ gulp.task('pre-test', function() {
 });
 
 gulp.task('test', ['pre-test'], function() {
-	return gulp.src('test/unit/*.js')
+	// use individual tests to control the sequence they get executed
+	// first run the ca-tests that tests all the member registration and
+	// enrollment scenarios (good and bad calls). then the rest of the
+	// tests will re-used the same key value store that has saved the
+	// user certificates so they can interact with the network
+	return gulp.src(['test/unit/ca-tests.js', 'test/unit/endorser-tests.js', 'test/unit/orderer-tests.js', 'test/unit/orderer-member-tests.js', 'test/unit/end-to-end.js', 'test/unit/headless-tests.js'])
 		.pipe(tape({
 			reporter: tapColorize()
 		}))

test/unit/ca-tests.js

@@ -21,8 +21,9 @@ var test = _test(tape);
 var hfc = require('../..');
 var util = require('util');
 var fs = require('fs');
+var testUtil = require('./util.js');
 
-var keyValStorePath = '/tmp/keyValStore';
+var keyValStorePath = testUtil.KVS;
 var keyValStorePath2 = keyValStorePath + '2';
 
 //

test/unit/end-to-end.js

@@ -25,7 +25,7 @@ var webUser;
 testUtil.setupChaincodeDeploy();
 
 chain.setKeyValueStore(hfc.newKeyValueStore({
-	path: '/tmp/kvs-hfc-e2e'
+	path: testUtil.KVS
 }));
 
 chain.setMemberServicesUrl('grpc://localhost:7054');

test/unit/endorser-tests.js

@@ -24,7 +24,7 @@ var util = require('util');
 var fs = require('fs');
 var testUtil = require('./util.js');
 
-var keyValStorePath = '/tmp/keyValStore';
+var keyValStorePath = testUtil.KVS;
 
 testUtil.setupChaincodeDeploy();
 

test/unit/orderer-member-tests.js

@@ -21,11 +21,12 @@ var test = _test(tape);
 var hfc = require('../..');
 var util = require('util');
 var fs = require('fs');
+var testUtil = require('./util.js');
 
 var Orderer = require('../../lib/Orderer.js');
 var Member = require('../../lib/Member.js');
 
-var keyValStorePath = '/tmp/keyValStore';
+var keyValStorePath = testUtil.KVS;
 
 //
 // Orderer via chain setOrderer/getOrderer

test/unit/orderer-tests.js

@@ -21,10 +21,11 @@ var test = _test(tape);
 var hfc = require('../..');
 var util = require('util');
 var fs = require('fs');
+var testUtil = require('./util.js');
 
 var Orderer = require('../../lib/Orderer.js');
 
-var keyValStorePath = '/tmp/keyValStore';
+var keyValStorePath = testUtil.KVS;
 
 //
 // Orderer happy path test

test/unit/util.js

@@ -1,6 +1,7 @@
 var path = require('path');
 
 module.exports.CHAINCODE_PATH = 'github.com/example_cc';
+module.exports.KVS = '/tmp/hfc-test-kvs';
 
 // temporarily set $GOPATH to the test fixture folder
 module.exports.setupChaincodeDeploy = function() {