Merge pull request #19 from murgatroid99/interop_test_move

Move interop, performance, and stress tests out of the native package

gulpfile.js

@@ -5,10 +5,13 @@ const help = require('gulp-help');
 const gulp = help(_gulp);
 
 require('./packages/grpc-js-core/gulpfile');
+require('./test/gulpfile');
 
 gulp.task('lint', 'Emit linting errors in source and test files', ['js.core.lint']);
 
-gulp.task('build', 'Build packages', ['js.core.compile']);
+gulp.task('link', 'Link local packages together', ['internal.test.link']);
+
+gulp.task('build', 'Build packages', ['js.core.compile', 'link']);
 
 gulp.task('clean', 'Delete generated files', ['js.core.clean']);
 

package.json

@@ -9,8 +9,16 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "async": "^2.5.0",
+    "body-parser": "^1.18.0",
+    "express": "^4.15.4",
+    "google-auth-library": "^0.11.0",
+    "grpc": "^1.6.0",
     "gulp": "^3.9.1",
-    "gulp-help": "^1.6.1"
+    "gulp-help": "^1.6.1",
+    "gulp-run": "^1.7.1",
+    "lodash": "^4.17.4",
+    "poisson-process": "^0.2.2"
   },
   "scripts": {
     "install": "cd packages/grpc-js-core && npm install"

test/gulpfile.js

@@ -0,0 +1,11 @@
+const _gulp = require('gulp');
+const help = require('gulp-help');
+const run = require('gulp-run');
+
+// gulp-help monkeypatches tasks to have an additional description parameter
+const gulp = help(_gulp);
+
+gulp.task('internal.test.link', 'Link local copies of grpc packages', () => {
+  return run(`npm link ${__dirname}/../packages/grpc-native-core`).exec()
+      .pipe(gulp.dest('output'));
+});

test/interop/interop_client.js

@@ -20,9 +20,10 @@
 
 var fs = require('fs');
 var path = require('path');
-var grpc = require('..');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 var testProto = grpc.load({
-  root: __dirname + '/../../..',
+  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
   file: 'src/proto/grpc/testing/test.proto'}).grpc.testing;
 var GoogleAuth = require('google-auth-library');
 

test/interop/interop_server.js

@@ -22,9 +22,10 @@ var fs = require('fs');
 var path = require('path');
 var _ = require('lodash');
 var AsyncDelayQueue = require('./async_delay_queue');
-var grpc = require('..');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 var testProto = grpc.load({
-  root: __dirname + '/../../..',
+  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
   file: 'src/proto/grpc/testing/test.proto'}).grpc.testing;
 
 var ECHO_INITIAL_KEY = 'x-grpc-test-echo-initial';

test/performance/benchmark_client.js

@@ -35,9 +35,10 @@ var Histogram = require('./histogram');
 
 var genericService = require('./generic_service');
 
-var grpc = require('../../../');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 var serviceProto = grpc.load({
-  root: __dirname + '/../../..',
+  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
   file: 'src/proto/grpc/testing/services.proto'}).grpc.testing;
 
 /**

test/performance/benchmark_server.js

@@ -30,9 +30,10 @@ var util = require('util');
 
 var genericService = require('./generic_service');
 
-var grpc = require('../../../');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 var serviceProto = grpc.load({
-  root: __dirname + '/../../..',
+  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
   file: 'src/proto/grpc/testing/services.proto'}).grpc.testing;
 
 /**

test/performance/worker.js

@@ -21,9 +21,10 @@
 var console = require('console');
 var WorkerServiceImpl = require('./worker_service_impl');
 
-var grpc = require('../../../');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 var serviceProto = grpc.load({
-  root: __dirname + '/../../..',
+  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
   file: 'src/proto/grpc/testing/services.proto'}).grpc.testing;
 
 function runServer(port, benchmark_impl) {

test/stress/metrics_client.js

@@ -18,9 +18,10 @@
 
 'use strict';
 
-var grpc = require('../../..');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 
-var proto = grpc.load(__dirname + '/../../proto/grpc/testing/metrics.proto');
+var proto = grpc.load(__dirname + '/../packages/grpc-native-core/ext/grpc/src/proto/grpc/testing/metrics.proto');
 var metrics = proto.grpc.testing;
 
 function main() {

test/stress/metrics_server.js

@@ -20,9 +20,10 @@
 
 var _ = require('lodash');
 
-var grpc = require('../../..');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 
-var proto = grpc.load(__dirname + '/../../proto/grpc/testing/metrics.proto');
+var proto = grpc.load(__dirname + '/../packages/grpc-native-core/ext/grpc/src/proto/grpc/testing/metrics.proto');
 var metrics = proto.grpc.testing;
 
 function getGauge(call, callback) {

test/stress/stress_client.js

@@ -20,7 +20,8 @@
 
 var _ = require('lodash');
 
-var grpc = require('../../..');
+// TODO(murgatroid99): use multiple grpc implementations
+var grpc = require('grpc');
 
 var interop_client = require('../interop/interop_client');
 var MetricsServer = require('./metrics_server');