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

Merge pull request #95 from murgatroid99/update_submodule_unskip_test 

Update the submodule and unskip previously failing test
This commit is contained in:
Michael Lumish 2017-11-17 13:07:47 -08:00 committed by GitHub
parent 56ba5d2482 66aeac683d
commit 7528a3d391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grpc-native-core/binding.gyp
View File

@ -683,7 +683,6 @@
'deps/grpc/src/core/lib/http/httpcli.cc', 'deps/grpc/src/core/lib/http/httpcli.cc',
'deps/grpc/src/core/lib/http/parser.cc', 'deps/grpc/src/core/lib/http/parser.cc',
'deps/grpc/src/core/lib/iomgr/call_combiner.cc', 'deps/grpc/src/core/lib/iomgr/call_combiner.cc',
'deps/grpc/src/core/lib/iomgr/closure.cc',
'deps/grpc/src/core/lib/iomgr/combiner.cc', 'deps/grpc/src/core/lib/iomgr/combiner.cc',
'deps/grpc/src/core/lib/iomgr/endpoint.cc', 'deps/grpc/src/core/lib/iomgr/endpoint.cc',
'deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc', 'deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc',

2
packages/grpc-native-core/deps/grpc

@ -1 +1 @@
Subproject commit 3a54b8673eed472679b11bb463cfcaf50ba6e282 Subproject commit dbca3d9b765b8e13ead6327fdd4904fe0fa05c84

2
packages/grpc-native-core/package.json
View File

@ -31,7 +31,7 @@
"arguejs": "^0.2.3", "arguejs": "^0.2.3",
"lodash": "^4.15.0", "lodash": "^4.15.0",
"nan": "^2.0.0", "nan": "^2.0.0",
"node-pre-gyp": "^0.6.39", "node-pre-gyp": "^0.6.35",
"protobufjs": "^5.0.0" "protobufjs": "^5.0.0"
}, },
"devDependencies": { "devDependencies": {

3
packages/grpc-native-core/test/channel_test.js
View File

@ -132,8 +132,7 @@ describe('channel', function() {
grpc.connectivityState.IDLE); grpc.connectivityState.IDLE);
}); });
}); });
// This suite test appears to be triggering grpc/grpc#12932; skipping for now describe('watchConnectivityState', function() {
describe.skip('watchConnectivityState', function() {
var channel; var channel;
beforeEach(function() { beforeEach(function() {
channel = new grpc.Channel('localhost', insecureCreds, {}); channel = new grpc.Channel('localhost', insecureCreds, {});