From 2f7201a2853e8fc31729aa9389bd506446fab20c Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 17 Nov 2017 10:28:07 -0800 Subject: [PATCH 1/2] Update the submodule and unskip previously failing test --- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/test/channel_test.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 3a54b867..5dc3cc1b 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 3a54b8673eed472679b11bb463cfcaf50ba6e282 +Subproject commit 5dc3cc1b01e908b5635e43a39bd914516c2a0071 diff --git a/packages/grpc-native-core/test/channel_test.js b/packages/grpc-native-core/test/channel_test.js index f9afa0be..373c5ac3 100644 --- a/packages/grpc-native-core/test/channel_test.js +++ b/packages/grpc-native-core/test/channel_test.js @@ -132,8 +132,7 @@ describe('channel', function() { grpc.connectivityState.IDLE); }); }); - // This suite test appears to be triggering grpc/grpc#12932; skipping for now - describe.skip('watchConnectivityState', function() { + describe('watchConnectivityState', function() { var channel; beforeEach(function() { channel = new grpc.Channel('localhost', insecureCreds, {}); From 66aeac683d7908f843f117e7981f36d71fde6a9a Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 17 Nov 2017 12:36:41 -0800 Subject: [PATCH 2/2] Update submodule to master --- packages/grpc-native-core/binding.gyp | 1 - packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index b9149669..27403b5a 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -683,7 +683,6 @@ 'deps/grpc/src/core/lib/http/httpcli.cc', 'deps/grpc/src/core/lib/http/parser.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/endpoint.cc', 'deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc', diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 5dc3cc1b..dbca3d9b 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 5dc3cc1b01e908b5635e43a39bd914516c2a0071 +Subproject commit dbca3d9b765b8e13ead6327fdd4904fe0fa05c84 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 782d58ac..91498375 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -31,7 +31,7 @@ "arguejs": "^0.2.3", "lodash": "^4.15.0", "nan": "^2.0.0", - "node-pre-gyp": "^0.6.39", + "node-pre-gyp": "^0.6.35", "protobufjs": "^5.0.0" }, "devDependencies": {