[FAB-1390] Move tape util file

- Removes tape unit dir

Signed-off-by: heatherlp <heatherpollard0@gmail.com>
Change-Id: Ied6f5b7708658ab1392a7e2952b62ad4483def85

build/tasks/test.js

@@ -19,7 +19,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const util = require('util');
 const shell = require('gulp-shell');
-const tapeUtil = require('../../test/unit/util.js');
+const tapeUtil = require('../../test/integration/util.js');
 
 // Debug level of Docker containers used in scenario tests
 process.env.DOCKER_DEBUG = 'INFO';
@@ -288,16 +288,11 @@ gulp.task('run-tape-e2e', ['docker-ready'],
 	});
 
 // Filter out tests that should not be run on specific operating systems since only the x64 CI jobs are configured with SoftHSM
-// - disable the pkcs11 (HSM) tests for s390 (non x86)
 // - may be enabled manually with an environment variable, (actually left enabled, but disable the non HSM version of the e2e test)
 function shouldRunTests(tests) {
 	if (arch.startsWith('s390')) {
-		// for now always disable the pkcs11 testing on s390
-		tests.push('!test/unit/pkcs11.js');
 		tests.push('!test/integration/network-e2e/e2e-hsm.js');
 	} else if (typeof process.env.PKCS11_TESTS === 'string' && process.env.PKCS11_TESTS.toLowerCase() === 'false') {
-		// Disable HSM tests if not doing PKCS11 testing
-		tests.push('!test/unit/pkcs11.js');
 		tests.push('!test/integration/network-e2e/e2e-hsm.js');
 	} else {
 		// default is to run the PKCS11 tests so we need to disable the non HSM version

test/integration/channel-event-hub.js

@@ -18,7 +18,7 @@ const fs = require('fs');
 const Long = require('long');
 
 const Client = require('fabric-client');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const e2eUtils = require('./e2e/e2eUtils.js');
 
 // When running this as a standalone test, be sure to create and join a channel called 'mychannel'
@@ -1033,7 +1033,7 @@ function createChaincodeRegistrationAsArray(t, message, event_hub, chaincode_id,
 			t.fail('Failed to receive the ' + message + ' ::' + error);
 			reject(error);
 		},
-			{as_array: true}
+		{as_array: true}
 		);
 	});
 	return event_monitor;

test/integration/client.js

@@ -16,7 +16,7 @@ const path = require('path');
 const fs = require('fs-extra');
 
 const Client = require('fabric-client');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const couchdbUtil = require('./couchdb-util.js');
 
 const tag = 'integration.client: ';

test/integration/couchdb-fabricca-tests.js

@@ -15,7 +15,7 @@ const path = require('path');
 const Client = require('fabric-client');
 
 const FabricCAServices = require('fabric-ca-client/lib/FabricCAServices');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 
 const couchdbUtil = require('./couchdb-util.js');
 

test/integration/create-configtx-channel.js

@@ -16,7 +16,7 @@ const Client = require('fabric-client');
 const fs = require('fs');
 const path = require('path');
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const e2eUtils = require('./e2e/e2eUtils.js');
 
 let ORGS;

test/integration/discovery.js

@@ -15,7 +15,7 @@ const test = _test(tape);
 const fs = require('fs');
 const path = require('path');
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 
 test('\n\n***** D I S C O V E R Y  *****\n\n', async (t) => {
 

test/integration/e2e/create-channel.js

@@ -16,7 +16,7 @@ const Client = require('fabric-client');
 const fs = require('fs');
 const path = require('path');
 
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 const e2eUtils = require('./e2eUtils.js');
 
 

test/integration/e2e/e2eUtils.js

@@ -16,7 +16,7 @@ const fs = require('fs');
 const util = require('util');
 
 const Client = require('fabric-client');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 const e2eUtils = require('./e2eUtils.js');
 
 const e2e = testUtil.END2END;

test/integration/e2e/getCollectionsConfig.js

@@ -9,7 +9,7 @@ const _test = require('tape-promise').default;
 const test = _test(tape);
 
 const e2eUtils = require('./e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 
 test('getCollectionsConfig from peer', async (t) => {
 	const chaincodeId = testUtil.END2END.chaincodeIdPrivateData;

test/integration/e2e/install-chaincode-fail.js

@@ -16,7 +16,7 @@ const _test = require('tape-promise').default;
 const test = _test(tape);
 
 const e2eUtils = require('./e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 
 test('\n\n***** End-to-end flow: chaincode install *****\n\n', (t) => {
 	testUtil.setupChaincodeDeploy();

test/integration/e2e/install-chaincode.js

@@ -16,7 +16,7 @@ const _test = require('tape-promise').default;
 const test = _test(tape);
 
 const e2eUtils = require('./e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 
 const version = 'v0';
 

test/integration/e2e/instantiate-chaincode.js

@@ -16,7 +16,7 @@ const _test = require('tape-promise').default;
 const test = _test(tape);
 
 const e2eUtils = require('./e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 
 test('\n\n***** End-to-end flow: instantiate chaincode *****\n\n', async (t) => {
 	try {

test/integration/e2e/invoke-transaction.js

@@ -12,7 +12,7 @@ const tape = require('tape');
 const _test = require('tape-promise').default;
 const test = _test(tape);
 const e2eUtils = require('./e2eUtils.js');
-const testUtils = require('../../unit/util');
+const testUtils = require('../util.js');
 const chaincodeId = testUtils.END2END.chaincodeId;
 
 test('\n\n***** End-to-end flow: invoke transaction to move money *****\n\n', async (t) => {

test/integration/e2e/join-channel.js

@@ -18,7 +18,7 @@ const fs = require('fs');
 
 const Client = require('fabric-client');
 
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 const e2eUtils = require('./e2eUtils.js');
 
 let tx_id = null;

test/integration/e2e/private-data.js

@@ -18,7 +18,7 @@ const _test = require('tape-promise').default;
 const test = _test(tape);
 
 const e2eUtils = require('./e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 
 const version = 'v0';
 const chaincodeId = testUtil.END2END.chaincodeIdPrivateData;

test/integration/e2e/query.js

@@ -12,7 +12,7 @@ const tape = require('tape');
 const _test = require('tape-promise').default;
 const test = _test(tape);
 const e2eUtils = require('./e2eUtils.js');
-const testUtils = require('../../unit/util');
+const testUtils = require('../util.js');
 const chaincodeId = testUtils.END2END.chaincodeId;
 
 test('\n\n***** End-to-end flow: query chaincode *****\n\n', async (t) => {

test/integration/e2e/updateAnchorPeers.js

@@ -15,7 +15,7 @@ const fs = require('fs');
 const path = require('path');
 
 const _commonProto = require('fabric-protos').common;
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 const e2eUtils = require('./e2eUtils.js');
 const channel_name = process.env.channel ? process.env.channel : 'mychannel';// can use "channel=<name>" to control the channel name from command line
 const anchorPeerTXFile = path.join(__dirname, '../../fixtures/crypto-material/channel-config/mychannel-org1anchor.tx');

test/integration/e2e/upgrade.js

@@ -12,7 +12,7 @@ const tape = require('tape');
 const _test = require('tape-promise').default;
 const test = _test(tape);
 const e2eUtils = require('./e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 const chaincodeId = testUtil.END2END.chaincodeId;
 
 test('\n\n***** U P G R A D E flow: chaincode install *****\n\n', (t) => {

test/integration/fabric-ca-services-tests.js

@@ -27,7 +27,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const http = require('http');
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 
 
 // var keyValStorePath = testUtil.KVS;

test/integration/fileKeyValueStore-fabricca-tests.js

@@ -11,7 +11,7 @@ const tape = require('tape');
 const _test = require('tape-promise').default;
 const test = _test(tape);
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const fs = require('fs-extra');
 
 const path = require('path');

test/integration/get-config.js

@@ -20,7 +20,7 @@ const fs = require('fs');
 const e2eUtils = require('./e2e/e2eUtils.js');
 
 const Client = require('fabric-client');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const Peer = require('fabric-client/lib/Peer.js');
 const Orderer = require('fabric-client/lib/Orderer.js');
 

test/integration/grpc.js

@@ -17,7 +17,7 @@ const fs = require('fs');
 const crypto = require('crypto');
 
 const e2eUtils = require('./e2e/e2eUtils.js');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const Client = require('fabric-client');
 
 const GRPC_SEND = 'grpc.max_send_message_length';

test/integration/install.js

@@ -20,7 +20,7 @@ const fs = require('fs');
 const e2eUtils = require('./e2e/e2eUtils.js');
 
 const Client = require('fabric-client');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 
 let ORGS;
 

test/integration/instantiate.js

@@ -17,7 +17,7 @@ const util = require('util');
 const Client = require('fabric-client');
 const {Utils:utils} = require('fabric-common');
 const e2eUtils = require('./e2e/e2eUtils.js');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const logger = utils.getLogger('instantiate-chaincode');
 
 const e2e = testUtil.END2END;

test/integration/invoke.js

@@ -17,7 +17,7 @@ const test = _test(tape);
 
 const Client = require('fabric-client');
 const {Utils:utils} = require('fabric-common');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const e2e = testUtil.END2END;
 const e2eUtils = require('./e2e/e2eUtils.js');
 

test/integration/network-config.js

@@ -19,7 +19,7 @@ const fsx = require('fs-extra');
 
 const path = require('path');
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 
 
 test('\n\n***** clean up the connection profile testing stores  *****\n\n', async (t) => {

test/integration/network-e2e/install-chaincode.js

@@ -16,7 +16,7 @@ const _test = require('tape-promise').default;
 const test = _test(tape);
 
 const e2eUtils = require('../e2e/e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 const version = 'v0';
 
 test('\n\n***** Network End-to-end flow: chaincode install *****\n\n', (t) => {

test/integration/network-e2e/instantiate-chaincode.js

@@ -17,7 +17,7 @@ const _test = require('tape-promise').default;
 const test = _test(tape);
 
 const e2eUtils = require('../e2e/e2eUtils.js');
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 
 
 

test/integration/network-e2e/invoke-hsm.js

@@ -11,7 +11,7 @@ const {Gateway, HsmX509Provider, Wallets} = require('fabric-network');
 const fs = require('fs-extra');
 
 const e2eUtils = require('../e2e/e2eUtils.js');
-const testUtils = require('../../unit/util');
+const testUtils = require('../util.js');
 const channelName = testUtils.NETWORK_END2END.channel;
 const chaincodeId = testUtils.NETWORK_END2END.chaincodeId;
 

test/integration/network-e2e/updateAnchorPeers.js

@@ -13,7 +13,7 @@ const test = _test(tape);
 const fs = require('fs');
 const path = require('path');
 
-const testUtil = require('../../unit/util.js');
+const testUtil = require('../util.js');
 const channel_name = testUtil.NETWORK_END2END.channel;
 const anchorPeerTXFileOrg1 = path.join(__dirname, '../../fixtures/crypto-material/channel-config/mychannel-org1anchor.tx');
 

test/integration/only-admin.js

@@ -15,7 +15,7 @@ const test = _test(tape);
 const fs = require('fs');
 const path = require('path');
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 
 // Testing will demostrate how the connetion profile configuration may hold a
 // admin user identity and it will be used for all fabric interactions.

test/integration/orderer-channel-tests.js

@@ -16,7 +16,7 @@ const e2eUtils = require('./e2e/e2eUtils.js');
 const fs = require('fs');
 const path = require('path');
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 
 const Client = require('fabric-client');
 const Orderer = require('fabric-client/lib/Orderer.js');

test/integration/query.js

@@ -25,7 +25,7 @@ const util = require('util');
 const e2eUtils = require('./e2e/e2eUtils.js');
 const fs = require('fs');
 
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const Client = require('fabric-client');
 const Peer = require('fabric-client/lib/Peer.js');
 const Orderer = require('fabric-client/lib/Orderer.js');

test/integration/upgrade.js

@@ -15,7 +15,7 @@ const fs = require('fs');
 
 const Client = require('fabric-client');
 const {Utils:utils} = require('fabric-common');
-const testUtil = require('../unit/util.js');
+const testUtil = require('./util.js');
 const e2eUtils = require('./e2e/e2eUtils.js');
 const logger = utils.getLogger('upgrade-chaincode');
 

test/unit/util.js → test/integration/util.js

@@ -117,7 +117,7 @@ module.exports.existsSync = function(absolutePath /* string*/) {
 
 module.exports.readFile = readFile;
 
-Client.addConfigFile(path.join(__dirname, '../integration/e2e/config.json'));
+Client.addConfigFile(path.join(__dirname, './e2e/config.json'));
 const ORGS = Client.getConfigSetting('test-network');
 
 const	tlsOptions = {

test/typescript/integration/network-e2e/invoke.ts

@@ -34,7 +34,7 @@ import {
 
 import e2eUtils = require('../../../integration/e2e/e2eUtils.js');
 import sampleEventStrategy = require('../../../integration/network-e2e/sample-transaction-event-handler');
-import testUtils = require('../../../unit/util');
+import testUtils = require('../../../integration/util.js');
 
 const test: any = tapePromise.default(tape);
 const channelName: string = testUtils.NETWORK_END2END.channel;

test/typescript/integration/network-e2e/query.ts

@@ -28,7 +28,7 @@ import {
 import sampleQueryStrategy = require('./sample-query-handler');
 
 import e2eUtils = require('../../../integration/e2e/e2eUtils.js');
-import testUtils = require('../../../unit/util.js');
+import testUtils = require('../../../integration/util.js');
 
 const test: any = tapePromise.default(tape);
 const channelName: string = testUtils.NETWORK_END2END.channel;