From aac8f141cba18e9dc3b565085673fcc2dae4fe24 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 17 Aug 2015 13:35:54 -0700 Subject: [PATCH 1/5] Made deadline tests accept INTERNAL status --- src/node/interop/interop_client.js | 4 +++- src/node/test/surface_test.js | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/node/interop/interop_client.js b/src/node/interop/interop_client.js index 6d6f9a349e5..612dcf01f65 100644 --- a/src/node/interop/interop_client.js +++ b/src/node/interop/interop_client.js @@ -264,7 +264,9 @@ function timeoutOnSleepingServer(client, done) { payload: {body: zeroBuffer(27182)} }); call.on('error', function(error) { - assert.strictEqual(error.code, grpc.status.DEADLINE_EXCEEDED); + + assert(error.code === grpc.status.DEADLINE_EXCEEDED || + error.code === grpc.status.INTERNAL); done(); }); } diff --git a/src/node/test/surface_test.js b/src/node/test/surface_test.js index 52515cc8e7c..ec7ed87728d 100644 --- a/src/node/test/surface_test.js +++ b/src/node/test/surface_test.js @@ -784,7 +784,8 @@ describe('Other conditions', function() { client.clientStream(function(err, value) { try { assert(err); - assert.strictEqual(err.code, grpc.status.DEADLINE_EXCEEDED); + assert(err.code === grpc.status.DEADLINE_EXCEEDED || + err.code === grpc.status.INTERNAL); } finally { callback(err, value); done(); @@ -809,7 +810,8 @@ describe('Other conditions', function() { null, {parent: parent, propagate_flags: deadline_flags}); child.on('error', function(err) { assert(err); - assert.strictEqual(err.code, grpc.status.DEADLINE_EXCEEDED); + assert(err.code === grpc.status.DEADLINE_EXCEEDED || + err.code === grpc.status.INTERNAL); done(); }); }; From b9b9d6ee8e969aa1cd987f5153b8be616424a719 Mon Sep 17 00:00:00 2001 From: yang-g Date: Tue, 18 Aug 2015 12:56:58 -0700 Subject: [PATCH 2/5] add a README for include/grpc++/impl --- include/grpc++/impl/README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 include/grpc++/impl/README.md diff --git a/include/grpc++/impl/README.md b/include/grpc++/impl/README.md new file mode 100644 index 00000000000..612150caa04 --- /dev/null +++ b/include/grpc++/impl/README.md @@ -0,0 +1,4 @@ +**The APIs in this directory are not stable!** + +This directory contains header files that need to be installed but are not part +of the public API. Users should not use these headers directly. From f900fb84b26b04a246201ab9911f86a83e7ae523 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 18 Aug 2015 15:58:43 -0700 Subject: [PATCH 3/5] Fix build breakage --- src/core/surface/version.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/surface/version.c b/src/core/surface/version.c index 61e762eb601..d7aaba3868e 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,6 @@ #include -const char *grpc_version_string(void) { return "0.10.1.0"; } +const char *grpc_version_string(void) { + return "0.10.1.0"; +} From 9876077fdeaed87851a1ad14a7d892867f68ad74 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 18 Aug 2015 16:45:06 -0700 Subject: [PATCH 4/5] disable grpc_zookeeper target on windows --- build.json | 3 +-- src/core/surface/version.c | 4 +++- vsprojects/grpc.sln | 25 ------------------------- vsprojects/grpc_csharp_ext.sln | 17 ----------------- 4 files changed, 4 insertions(+), 45 deletions(-) diff --git a/build.json b/build.json index e5e435a0eea..85457dde86d 100644 --- a/build.json +++ b/build.json @@ -592,8 +592,7 @@ "external_deps": [ "zookeeper" ], - "secure": "no", - "vs_project_guid": "{F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}" + "secure": "no" }, { "name": "reconnect_server", diff --git a/src/core/surface/version.c b/src/core/surface/version.c index 61e762eb601..d7aaba3868e 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,6 @@ #include -const char *grpc_version_string(void) { return "0.10.1.0"; } +const char *grpc_version_string(void) { + return "0.10.1.0"; +} diff --git a/vsprojects/grpc.sln b/vsprojects/grpc.sln index 0a9b5c28261..42ddef4568b 100644 --- a/vsprojects/grpc.sln +++ b/vsprojects/grpc.sln @@ -52,15 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_unsecure", "grpc_unsec {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_zookeeper", "grpc_zookeeper\grpc_zookeeper.vcxproj", "{F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}" - ProjectSection(myProperties) = preProject - lib = "True" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc++", "grpc++\grpc++.vcxproj", "{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}" ProjectSection(myProperties) = preProject lib = "True" @@ -187,22 +178,6 @@ Global {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release-DLL|Win32.Build.0 = Release-DLL|Win32 {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release-DLL|x64.ActiveCfg = Release-DLL|x64 {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release-DLL|x64.Build.0 = Release-DLL|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|Win32.ActiveCfg = Debug|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|x64.ActiveCfg = Debug|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|Win32.ActiveCfg = Release|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|x64.ActiveCfg = Release|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|Win32.Build.0 = Debug|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|x64.Build.0 = Debug|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|Win32.Build.0 = Release|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|x64.Build.0 = Release|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug-DLL|x64.Build.0 = Debug|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release-DLL|Win32.Build.0 = Release|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release-DLL|x64.ActiveCfg = Release|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release-DLL|x64.Build.0 = Release|x64 {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Debug|Win32.ActiveCfg = Debug|Win32 {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Debug|x64.ActiveCfg = Debug|x64 {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/vsprojects/grpc_csharp_ext.sln b/vsprojects/grpc_csharp_ext.sln index aa41d875881..df84f3dc167 100644 --- a/vsprojects/grpc_csharp_ext.sln +++ b/vsprojects/grpc_csharp_ext.sln @@ -24,15 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_unsecure", "grpc_unsec {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_zookeeper", "grpc_zookeeper\grpc_zookeeper.vcxproj", "{F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}" - ProjectSection(myProperties) = preProject - lib = "True" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_csharp_ext", "grpc_csharp_ext\grpc_csharp_ext.vcxproj", "{D64C6D63-4458-4A88-AB38-35678384A7E4}" ProjectSection(myProperties) = preProject lib = "True" @@ -74,14 +65,6 @@ Global {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release|Win32.Build.0 = Release-DLL|Win32 {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release|x64.ActiveCfg = Release-DLL|x64 {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release|x64.Build.0 = Release-DLL|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|Win32.ActiveCfg = Debug|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|Win32.Build.0 = Debug|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|x64.ActiveCfg = Debug|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Debug|x64.Build.0 = Debug|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|Win32.ActiveCfg = Release|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|Win32.Build.0 = Release|Win32 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|x64.ActiveCfg = Release|x64 - {F14EBEC1-DC43-45D3-8A7D-1A47072EFE50}.Release|x64.Build.0 = Release|x64 {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.ActiveCfg = Debug|Win32 {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.Build.0 = Debug|Win32 {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|x64.ActiveCfg = Debug|x64 From 81491b60430d5ca488cdd6e2e28f3bc2f5d9c6e2 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Tue, 18 Aug 2015 16:46:53 -0700 Subject: [PATCH 5/5] Removed function introducing dependency on proto in .h --- test/cpp/interop/client_helper.cc | 16 ---------------- test/cpp/interop/client_helper.h | 6 ------ test/cpp/interop/interop_client.cc | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc index 65fdc63b43c..b8a222c54a0 100644 --- a/test/cpp/interop/client_helper.cc +++ b/test/cpp/interop/client_helper.cc @@ -65,8 +65,6 @@ DECLARE_string(default_service_account); DECLARE_string(service_account_key_file); DECLARE_string(oauth_scope); -using grpc::testing::CompressionType; - namespace grpc { namespace testing { @@ -143,20 +141,6 @@ std::shared_ptr CreateChannelForTestCase( } } -CompressionType GetInteropCompressionTypeFromCompressionAlgorithm( - grpc_compression_algorithm algorithm) { - switch (algorithm) { - case GRPC_COMPRESS_NONE: - return CompressionType::NONE; - case GRPC_COMPRESS_GZIP: - return CompressionType::GZIP; - case GRPC_COMPRESS_DEFLATE: - return CompressionType::DEFLATE; - default: - GPR_ASSERT(false); - } -} - InteropClientContextInspector::InteropClientContextInspector( const ::grpc::ClientContext& context) : context_(context) {} diff --git a/test/cpp/interop/client_helper.h b/test/cpp/interop/client_helper.h index 28fca3266cc..000374ae8e3 100644 --- a/test/cpp/interop/client_helper.h +++ b/test/cpp/interop/client_helper.h @@ -39,8 +39,6 @@ #include #include -#include "test/proto/messages.grpc.pb.h" - namespace grpc { namespace testing { @@ -51,10 +49,6 @@ grpc::string GetOauth2AccessToken(); std::shared_ptr CreateChannelForTestCase( const grpc::string& test_case); -grpc::testing::CompressionType -GetInteropCompressionTypeFromCompressionAlgorithm( - grpc_compression_algorithm algorithm); - class InteropClientContextInspector { public: InteropClientContextInspector(const ::grpc::ClientContext& context); diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index ddf91aa5eb1..9e738b6d3b4 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -67,6 +67,20 @@ const int kResponseMessageSize = 1030; const int kReceiveDelayMilliSeconds = 20; const int kLargeRequestSize = 271828; const int kLargeResponseSize = 314159; + +CompressionType GetInteropCompressionTypeFromCompressionAlgorithm( + grpc_compression_algorithm algorithm) { + switch (algorithm) { + case GRPC_COMPRESS_NONE: + return CompressionType::NONE; + case GRPC_COMPRESS_GZIP: + return CompressionType::GZIP; + case GRPC_COMPRESS_DEFLATE: + return CompressionType::DEFLATE; + default: + GPR_ASSERT(false); + } +} } // namespace InteropClient::InteropClient(std::shared_ptr channel)