Splitting out interop's server helper. #7447
Conversation
| std::shared_ptr<ServerCredentials> CreateInteropServerCredentials() { | ||
| if (FLAGS_use_tls) { | ||
| SslServerCredentialsOptions::PemKeyCertPair pkcp = {test_server1_key, | ||
| test_server1_cert}; |
There was a problem hiding this comment.
This would normally get my spidey-sense tingling (brace-lists) but this case was certainly safe, so it's all good.
There was a problem hiding this comment.
Note that I didn't write this. I only moved code from one file to another.
On Mon, Jul 18, 2016 at 11:32 AM, Vijay Pai notifications@github.com
wrote:
In test/cpp/interop/server_helper_auth.cc
#7447 (comment):
+#include <gflags/gflags.h>
+#include <grpc++/security/server_credentials.h>
+
+#include "src/core/lib/surface/call_test_only.h"
+#include "test/core/end2end/data/ssl_test_data.h"
+
+DECLARE_bool(use_tls);
+
+namespace grpc {
+namespace testing {
+
+std::shared_ptr CreateInteropServerCredentials() {
- if (FLAGS_use_tls) {
- SslServerCredentialsOptions::PemKeyCertPair pkcp = {test_server1_key,
test_server1_cert};This would normally get my spidey-sense tingling (brace-lists) but this
case was certainly safe, so it's all good.—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
https://github.com/grpc/grpc/pull/7447/files/6b00175833540ad8af4c13627c9690145a9f158b#r71202414,
or mute the thread
https://github.com/notifications/unsubscribe-auth/AG8bptvie7YnjNmN7AR49B2O4lFguKb-ks5qW8bCgaJpZM4JO_6g
.
|
LGTM, but what's the motivation? |
|
I'm actually going to change radically that PR for a different approach... |
nicolasnoble
force-pushed
the
interop_server_split
branch
from
6b00175 to
6570b83
Compare
|
Updated. Also superseeds #7358. |
|
LGTM. |
|
Rebuilding to see some greenness. |
|
Needs a merge with master for the sanity checks to work, I think. |
|
Probably. Merged from master. |
…rver_split Conflicts: Makefile
|
Merged again, after conflict resolution. |
|
Any new on this PR? It's passed the required tests but the basic tests that are still failing are the ones that seem directly related (interop_test), as well as sanity. |
|
Ok, I found the problem (I think). The test in interop_server.cc needs to be changed from |
Fix exit condition
|
Any idea why sanity is still failing here? |
|
@vjpai are you in the same namespace? I think |
Just want to know if tests pass. Squashed commit of the following: commit 4e7259d Merge: 138d3e1 abaa705 Author: Nicolas "Pixel" Noble <pixel@nobis-crew.org> Date: Tue Aug 2 18:32:05 2016 +0200 Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split commit 138d3e1 Merge: 64f8d09 96b7b52 Author: Nicolas Noble <nicolasnoble@users.noreply.github.com> Date: Mon Aug 1 10:09:04 2016 -0700 Merge pull request grpc#9 from vjpai/sigint Fix exit condition commit 96b7b52 Author: Vijay Pai <vpai@google.com> Date: Mon Aug 1 09:33:38 2016 -0700 Fix exit condition commit 64f8d09 Merge: bc0b088 818564c Author: Nicolas "Pixel" Noble <pixel@nobis-crew.org> Date: Wed Jul 27 19:50:56 2016 +0200 Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split commit bc0b088 Merge: c326407 01da196 Author: Nicolas "Pixel" Noble <pixel@nobis-crew.org> Date: Mon Jul 25 23:51:01 2016 +0200 Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split Conflicts: Makefile commit c326407 Merge: 6570b83 de2d9fc Author: Nicolas "Pixel" Noble <pixel@nobis-crew.org> Date: Mon Jul 25 21:51:59 2016 +0200 Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split commit 6570b83 Author: Nicolas "Pixel" Noble <pixel@nobis-crew.org> Date: Mon Jul 18 23:29:50 2016 +0200 Splitting interop_server.cc
|
for Jenkins: test this please |
|
Finally, sanity comes back green - it didn't before on my last amendment. However, due to #7639, the interop tests aren't passing, so I'll have to override merging that one. |
|
Great! Glad to see this complete. |
No description provided.