grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

grpc-native: fix test paths

This commit is contained in:
Kelvin Jin 2018-02-28 14:27:31 -08:00
parent 98341acc7e
commit 41305f595c
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/grpc-native-core/interop/interop_client.js
View File

@ -21,9 +21,9 @@
var fs = require('fs');
var path = require('path');
// TODO(murgatroid99): use multiple grpc implementations
var grpc = require('grpc');
var grpc = require('..');
var testProto = grpc.load({
root: __dirname + '/../../packages/grpc-native-core/deps/grpc',
root: __dirname + '/../deps/grpc',
file: 'src/proto/grpc/testing/test.proto'}).grpc.testing;
var GoogleAuth = require('google-auth-library');
@ -566,7 +566,7 @@ function runTest(address, host_override, test_case, tls, test_ca, done, extra) {
if (tls) {
var ca_path;
if (test_ca) {
ca_path = path.join(__dirname, '../data/ca.pem');
ca_path = path.join(__dirname, '../test/data/ca.pem');
var ca_data = fs.readFileSync(ca_path);
creds = grpc.credentials.createSsl(ca_data);
} else {

8
packages/grpc-native-core/interop/interop_server.js
View File

@ -23,9 +23,9 @@ var path = require('path');
var _ = require('lodash');
var AsyncDelayQueue = require('./async_delay_queue');
// TODO(murgatroid99): use multiple grpc implementations
var grpc = require('grpc');
var grpc = require('..');
var testProto = grpc.load({
root: __dirname + '/../../packages/grpc-native-core/deps/grpc',
root: __dirname + '/../deps/grpc',
file: 'src/proto/grpc/testing/test.proto'}).grpc.testing;
var ECHO_INITIAL_KEY = 'x-grpc-test-echo-initial';
@ -202,8 +202,8 @@ function getServer(port, tls) {
var options = {};
var server_creds;
if (tls) {
var key_path = path.join(__dirname, '../data/server1.key');
var pem_path = path.join(__dirname, '../data/server1.pem');
var key_path = path.join(__dirname, '../test/data/server1.key');
var pem_path = path.join(__dirname, '../test/data/server1.pem');
var key_data = fs.readFileSync(key_path);
var pem_data = fs.readFileSync(pem_path);

4
packages/grpc-native-core/test/async_test.js
View File

@ -20,9 +20,9 @@
var assert = require('assert');
var grpc = require('grpc');
var grpc = require('..');
var math = grpc.load(
__dirname + '/../../packages/grpc-native-core/deps/grpc/src/proto/math/math.proto').math;
__dirname + '/../deps/grpc/src/proto/math/math.proto').math;
/**

8
packages/grpc-native-core/test/credentials_test.js
View File

@ -22,7 +22,7 @@ var assert = require('assert');
var fs = require('fs');
var path = require('path');
var grpc = require('grpc');
var grpc = require('..');
/**
* This is used for testing functions with multiple asynchronous calls that
@ -67,9 +67,9 @@ var fakeFailingGoogleCredentials = {
var key_data, pem_data, ca_data;
before(function() {
var key_path = path.join(__dirname, '../data/server1.key');
var pem_path = path.join(__dirname, '../data/server1.pem');
var ca_path = path.join(__dirname, '../data/ca.pem');
var key_path = path.join(__dirname, '/data/server1.key');
var pem_path = path.join(__dirname, '/data/server1.pem');
var ca_path = path.join(__dirname, '/data/ca.pem');
key_data = fs.readFileSync(key_path);
pem_data = fs.readFileSync(pem_path);
ca_data = fs.readFileSync(ca_path);

4
packages/grpc-native-core/test/math/math_grpc_pb.js
View File

@ -16,8 +16,8 @@
// limitations under the License.
//
'use strict';
var grpc = require('grpc');
var math_math_pb = require('../math/math_pb.js');
var grpc = require('../..');
var math_math_pb = require('./math_pb.js');
function serialize_DivArgs(arg) {
if (!(arg instanceof math_math_pb.DivArgs)) {

2
packages/grpc-native-core/test/math/math_server.js
View File

@ -18,7 +18,7 @@
'use strict';
var grpc = require('grpc');
var grpc = require('../..');
var grpcMath = require('./math_grpc_pb');
var math = require('./math_pb');

2
packages/grpc-native-core/test/math_client_test.js
View File

@ -20,7 +20,7 @@
var assert = require('assert');
var grpc = require('grpc');
var grpc = require('..');
var math = require('./math/math_pb');
var MathClient = require('./math/math_grpc_pb').MathClient;

2
packages/grpc-native-core/test/metadata_test.js
View File

@ -18,7 +18,7 @@
'use strict';
var Metadata = require('grpc').Metadata;
var Metadata = require('..').Metadata;
var assert = require('assert');

4
packages/grpc-native-core/test/server_test.js
View File

@ -72,8 +72,8 @@ describe('server', function() {
});
it('should bind to an unused port with ssl credentials', function() {
var port;
var key_path = path.join(__dirname, '../../../test/data/server1.key');
var pem_path = path.join(__dirname, '../../../test/data/server1.pem');
var key_path = path.join(__dirname, '/data/server1.key');
var pem_path = path.join(__dirname, '/data/server1.pem');
var key_data = fs.readFileSync(key_path);
var pem_data = fs.readFileSync(pem_path);
var creds = grpc.ServerCredentials.createSsl(null,

6
packages/grpc-native-core/test/surface_test.js
View File

@ -21,10 +21,10 @@
var assert = require('assert');
var _ = require('lodash');
var grpc = require('grpc');
var grpc = require('..');
var MathClient = grpc.load(
__dirname + '/../../packages/grpc-native-core/deps/grpc/src/proto/math/math.proto').math.Math;
__dirname + '/../deps/grpc/src/proto/math/math.proto').math.Math;
var mathServiceAttrs = MathClient.service;
/**
@ -485,7 +485,7 @@ describe('Echo metadata', function() {
call.end();
});
it('shows the correct user-agent string', function(done) {
var version = require('grpc/package.json').version;
var version = require('../package.json').version;
var call = client.unary({}, metadata,
function(err, data) { assert.ifError(err); });
call.on('metadata', function(metadata) {