Merge "[FAB-5363] NodeSDK - common config part 2"

hyperledger · Aug 30, 2017 · 244e2fe · 244e2fe
2 parents d698c57 + e2428ef
commit 244e2fe
Show file tree

Hide file tree

Showing 15 changed files with 1,469 additions and 962 deletions.
diff --git a/build/tasks/test.js b/build/tasks/test.js
@@ -96,7 +96,8 @@ gulp.task('test', ['clean-up', 'lint', 'pre-test', 'docker-ready', 'ca'], functi
 		'test/integration/e2e/query.js',
 		'test/integration/invoke.js',
 		'test/integration/perf/orderer.js',
-		'test/integration/perf/peer.js'
+		'test/integration/perf/peer.js',
+		'test/integration/network-config.js'
 	]))
 	.pipe(addsrc.append(
 		'test/unit/logger.js' // put this to the last so the debugging levels are not mixed up