From b910d76e27846c5a179cfc09e3ee1f8d680b81a3 Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Wed, 15 Mar 2017 11:54:49 +0000 Subject: [PATCH] Tests randomly fail as fighting over connection profile --- packages/animaltracking-network/package.json | 3 ++- packages/bond-network/package.json | 5 +++-- packages/bond-network/test/Bond.js | 7 +++++-- packages/carauction-network/package.json | 5 +++-- packages/carauction-network/test/CarAuction.js | 7 +++++-- packages/digitalproperty-network/package.json | 5 +++-- packages/digitalproperty-network/test/DigitalLandTitle.js | 7 +++++-- packages/marbles-network/package.json | 5 +++-- packages/marbles-network/test/MarblesTests.js | 7 +++++-- packages/perishable-network/package.json | 5 +++-- packages/perishable-network/test/perishable.js | 7 +++++-- packages/sample-network/package.json | 5 +++-- packages/sample-network/test/Sample.js | 7 +++++-- 13 files changed, 50 insertions(+), 25 deletions(-) diff --git a/packages/animaltracking-network/package.json b/packages/animaltracking-network/package.json index 26b9345..5ac4cf2 100644 --- a/packages/animaltracking-network/package.json +++ b/packages/animaltracking-network/package.json @@ -9,7 +9,7 @@ "postlint": "npm run licchk", "licchk": "license-check", "postlicchk": "npm run doc", - "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .", + "doc": "jsdoc --pedantic --recurse -c jsdoc.conf", "pkgstamp": "node ./scripts/pkgstamp.js" }, "repository": { @@ -26,6 +26,7 @@ "movement" ], "devDependencies": { + "browserfs": "^1.2.0", "composer-cli": "latest", "eslint": "^3.6.1", "jsdoc": "^3.4.1", diff --git a/packages/bond-network/package.json b/packages/bond-network/package.json index 18d7b99..90cf7c2 100644 --- a/packages/bond-network/package.json +++ b/packages/bond-network/package.json @@ -9,7 +9,7 @@ "postlint": "npm run licchk", "licchk": "license-check", "postlicchk": "npm run doc", - "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .", + "doc": "jsdoc --pedantic --recurse -c jsdoc.conf", "test": "mocha --recursive", "deploy": "./scripts/deploy.sh" }, @@ -25,11 +25,12 @@ "author": "Fabric Composer", "license": "Apache-2.0", "devDependencies": { + "browserfs": "^1.2.0", + "chai": "^3.5.0", "composer-admin": "latest", "composer-cli": "latest", "composer-client": "latest", "composer-connector-embedded": "latest", - "chai": "^3.5.0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.4.1", diff --git a/packages/bond-network/test/Bond.js b/packages/bond-network/test/Bond.js index 727b706..846c8cd 100644 --- a/packages/bond-network/test/Bond.js +++ b/packages/bond-network/test/Bond.js @@ -15,12 +15,14 @@ 'use strict'; const AdminConnection = require('composer-admin').AdminConnection; +const BrowserFS = require('browserfs/dist/node/index'); const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; const path = require('path'); require('chai').should(); +const bfs_fs = BrowserFS.BFSRequire('fs'); const NS = 'org.acme.bond'; describe('Publish Bond', () => { @@ -28,7 +30,8 @@ describe('Publish Bond', () => { let businessNetworkConnection; before(() => { - const adminConnection = new AdminConnection(); + BrowserFS.initialize(new BrowserFS.FileSystem.InMemory()); + const adminConnection = new AdminConnection({ fs: bfs_fs }); return adminConnection.createProfile('defaultProfile', { type: 'embedded' }) @@ -42,7 +45,7 @@ describe('Publish Bond', () => { return adminConnection.deploy(businessNetworkDefinition); }) .then(() => { - businessNetworkConnection = new BusinessNetworkConnection(); + businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs }); return businessNetworkConnection.connect('defaultProfile', 'bond-network', 'WebAppAdmin', 'DJY27pEnl16d'); }); }); diff --git a/packages/carauction-network/package.json b/packages/carauction-network/package.json index 984c330..4947000 100644 --- a/packages/carauction-network/package.json +++ b/packages/carauction-network/package.json @@ -9,7 +9,7 @@ "postlint": "npm run licchk", "licchk": "license-check", "postlicchk": "npm run doc", - "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .", + "doc": "jsdoc --pedantic --recurse -c jsdoc.conf", "test": "mocha --recursive", "deploy": "./scripts/deploy.sh" }, @@ -24,11 +24,12 @@ "author": "Fabric Composer", "license": "Apache-2.0", "devDependencies": { + "browserfs": "^1.2.0", + "chai": "^3.5.0", "composer-admin": "latest", "composer-cli": "latest", "composer-client": "latest", "composer-connector-embedded": "latest", - "chai": "^3.5.0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.4.1", diff --git a/packages/carauction-network/test/CarAuction.js b/packages/carauction-network/test/CarAuction.js index 3e58679..52282be 100644 --- a/packages/carauction-network/test/CarAuction.js +++ b/packages/carauction-network/test/CarAuction.js @@ -15,12 +15,14 @@ 'use strict'; const AdminConnection = require('composer-admin').AdminConnection; +const BrowserFS = require('browserfs/dist/node/index'); const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; const path = require('path'); require('chai').should(); +const bfs_fs = BrowserFS.BFSRequire('fs'); const NS = 'org.acme.vehicle.auction'; describe('CarAuction', () => { @@ -29,7 +31,8 @@ describe('CarAuction', () => { let businessNetworkConnection; before(() => { - const adminConnection = new AdminConnection(); + BrowserFS.initialize(new BrowserFS.FileSystem.InMemory()); + const adminConnection = new AdminConnection({ fs: bfs_fs }); return adminConnection.createProfile('defaultProfile', { type: 'embedded' }) @@ -43,7 +46,7 @@ describe('CarAuction', () => { return adminConnection.deploy(businessNetworkDefinition); }) .then(() => { - businessNetworkConnection = new BusinessNetworkConnection(); + businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs }); return businessNetworkConnection.connect('defaultProfile', 'carauction-network', 'WebAppAdmin', 'DJY27pEnl16d'); }); }); diff --git a/packages/digitalproperty-network/package.json b/packages/digitalproperty-network/package.json index b9da8dd..e298ebf 100644 --- a/packages/digitalproperty-network/package.json +++ b/packages/digitalproperty-network/package.json @@ -9,7 +9,7 @@ "postlint": "npm run licchk", "licchk": "license-check", "postlicchk": "npm run doc", - "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .", + "doc": "jsdoc --pedantic --recurse -c jsdoc.conf", "test": "mocha --recursive", "deploy": "./scripts/deploy.sh" }, @@ -23,11 +23,12 @@ "author": "Fabric Composer", "license": "Apache-2.0", "devDependencies": { + "browserfs": "^1.2.0", + "chai": "^3.5.0", "composer-admin": "latest", "composer-cli": "latest", "composer-client": "latest", "composer-connector-embedded": "latest", - "chai": "^3.5.0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.4.1", diff --git a/packages/digitalproperty-network/test/DigitalLandTitle.js b/packages/digitalproperty-network/test/DigitalLandTitle.js index fd422c9..089c870 100644 --- a/packages/digitalproperty-network/test/DigitalLandTitle.js +++ b/packages/digitalproperty-network/test/DigitalLandTitle.js @@ -15,19 +15,22 @@ 'use strict'; const AdminConnection = require('composer-admin').AdminConnection; +const BrowserFS = require('browserfs/dist/node/index'); const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; const path = require('path'); require('chai').should(); +const bfs_fs = BrowserFS.BFSRequire('fs'); describe('DigitalLandTitle', () => { let adminConnection; let businessNetworkConnection; before(() => { - adminConnection = new AdminConnection(); + BrowserFS.initialize(new BrowserFS.FileSystem.InMemory()); + const adminConnection = new AdminConnection({ fs: bfs_fs }); return adminConnection.createProfile('testprofile', { type: 'embedded' }) .then(() => { return adminConnection.connect('testprofile', 'WebAppAdmin', 'DJY27pEnl16d'); @@ -39,7 +42,7 @@ describe('DigitalLandTitle', () => { return adminConnection.deploy(businessNetworkDefinition); }) .then(() => { - businessNetworkConnection = new BusinessNetworkConnection(); + businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs }); return businessNetworkConnection.connect('testprofile', 'digitalproperty-network', 'WebAppAdmin', 'DJY27pEnl16d'); }); }); diff --git a/packages/marbles-network/package.json b/packages/marbles-network/package.json index 28e1a93..d16509c 100644 --- a/packages/marbles-network/package.json +++ b/packages/marbles-network/package.json @@ -9,7 +9,7 @@ "postlint": "npm run licchk", "licchk": "license-check", "postlicchk": "npm run doc", - "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .", + "doc": "jsdoc --pedantic --recurse -c jsdoc.conf", "test": "mocha --recursive", "deploy": "./scripts/deploy.sh" }, @@ -25,11 +25,12 @@ "author": "Fabric Composer", "license": "Apache-2.0", "devDependencies": { + "browserfs": "^1.2.0", + "chai": "^3.5.0", "composer-admin": "latest", "composer-cli": "latest", "composer-client": "latest", "composer-connector-embedded": "latest", - "chai": "^3.5.0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.4.1", diff --git a/packages/marbles-network/test/MarblesTests.js b/packages/marbles-network/test/MarblesTests.js index 56ebc44..487007a 100644 --- a/packages/marbles-network/test/MarblesTests.js +++ b/packages/marbles-network/test/MarblesTests.js @@ -15,12 +15,14 @@ 'use strict'; const AdminConnection = require('composer-admin').AdminConnection; +const BrowserFS = require('browserfs/dist/node/index'); const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; const path = require('path'); require('chai').should(); +const bfs_fs = BrowserFS.BFSRequire('fs'); const NS = 'org.fabric_composer.marbles'; describe('Marbles', () => { @@ -29,7 +31,8 @@ describe('Marbles', () => { let businessNetworkConnection; before(() => { - const adminConnection = new AdminConnection(); + BrowserFS.initialize(new BrowserFS.FileSystem.InMemory()); + const adminConnection = new AdminConnection({ fs: bfs_fs }); return adminConnection.createProfile('defaultProfile', { type: 'embedded' }) @@ -43,7 +46,7 @@ describe('Marbles', () => { return adminConnection.deploy(businessNetworkDefinition); }) .then(() => { - businessNetworkConnection = new BusinessNetworkConnection(); + businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs }); return businessNetworkConnection.connect('defaultProfile', 'marbles-network', 'WebAppAdmin', 'DJY27pEnl16d'); }); }); diff --git a/packages/perishable-network/package.json b/packages/perishable-network/package.json index e9c86dd..6c31a91 100644 --- a/packages/perishable-network/package.json +++ b/packages/perishable-network/package.json @@ -9,7 +9,7 @@ "postlint": "npm run licchk", "licchk": "license-check", "postlicchk": "npm run doc", - "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .", + "doc": "jsdoc --pedantic --recurse -c jsdoc.conf", "test": "mocha --recursive", "deploy": "./scripts/deploy.sh" }, @@ -26,11 +26,12 @@ "author": "Fabric Composer", "license": "Apache-2.0", "devDependencies": { + "browserfs": "^1.2.0", + "chai": "^3.5.0", "composer-admin": "latest", "composer-cli": "latest", "composer-client": "latest", "composer-connector-embedded": "latest", - "chai": "^3.5.0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.4.1", diff --git a/packages/perishable-network/test/perishable.js b/packages/perishable-network/test/perishable.js index e9225f4..31380d6 100644 --- a/packages/perishable-network/test/perishable.js +++ b/packages/perishable-network/test/perishable.js @@ -15,12 +15,14 @@ 'use strict'; const AdminConnection = require('composer-admin').AdminConnection; +const BrowserFS = require('browserfs/dist/node/index'); const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; const path = require('path'); require('chai').should(); +const bfs_fs = BrowserFS.BFSRequire('fs'); const NS = 'org.acme.shipping.perishable'; let grower_id = 'farmer@email.com'; let importer_id = 'supermarket@email.com'; @@ -31,7 +33,8 @@ describe('Perishable Shipping Network', () => { let businessNetworkConnection; before(() => { - const adminConnection = new AdminConnection(); + BrowserFS.initialize(new BrowserFS.FileSystem.InMemory()); + const adminConnection = new AdminConnection({ fs: bfs_fs }); return adminConnection.createProfile('defaultProfile', { type: 'embedded' }) @@ -45,7 +48,7 @@ describe('Perishable Shipping Network', () => { return adminConnection.deploy(businessNetworkDefinition); }) .then(() => { - businessNetworkConnection = new BusinessNetworkConnection(); + businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs }); return businessNetworkConnection.connect('defaultProfile', 'perishable-network', 'WebAppAdmin', 'DJY27pEnl16d'); }) .then(() => { diff --git a/packages/sample-network/package.json b/packages/sample-network/package.json index 39034b6..8984e3f 100644 --- a/packages/sample-network/package.json +++ b/packages/sample-network/package.json @@ -9,7 +9,7 @@ "postlint": "npm run licchk", "licchk": "license-check", "postlicchk": "npm run doc", - "doc": "jsdoc --pedantic --recurse -c jsdoc.conf .", + "doc": "jsdoc --pedantic --recurse -c jsdoc.conf", "test": "mocha --recursive", "deploy": "./scripts/deploy.sh" }, @@ -24,11 +24,12 @@ "author": "Fabric Composer", "license": "Apache-2.0", "devDependencies": { + "browserfs": "^1.2.0", + "chai": "^3.5.0", "composer-admin": "latest", "composer-cli": "latest", "composer-client": "latest", "composer-connector-embedded": "latest", - "chai": "^3.5.0", "eslint": "^3.6.1", "istanbul": "^0.4.5", "jsdoc": "^3.4.1", diff --git a/packages/sample-network/test/Sample.js b/packages/sample-network/test/Sample.js index 2f28eff..ebdbcd5 100644 --- a/packages/sample-network/test/Sample.js +++ b/packages/sample-network/test/Sample.js @@ -15,12 +15,14 @@ 'use strict'; const AdminConnection = require('composer-admin').AdminConnection; +const BrowserFS = require('browserfs/dist/node/index'); const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; const path = require('path'); require('chai').should(); +const bfs_fs = BrowserFS.BFSRequire('fs'); const NS = 'org.acme.sample'; describe('Sample', () => { @@ -29,7 +31,8 @@ describe('Sample', () => { let businessNetworkConnection; before(() => { - const adminConnection = new AdminConnection(); + BrowserFS.initialize(new BrowserFS.FileSystem.InMemory()); + const adminConnection = new AdminConnection({ fs: bfs_fs }); return adminConnection.createProfile('defaultProfile', { type : 'embedded' }) @@ -43,7 +46,7 @@ describe('Sample', () => { return adminConnection.deploy(businessNetworkDefinition); }) .then(() => { - businessNetworkConnection = new BusinessNetworkConnection(); + businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs }); return businessNetworkConnection.connect('defaultProfile', 'sample-network', 'WebAppAdmin', 'DJY27pEnl16d'); }); });