diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-03 09:23:47 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-03 09:23:47 -0700 |
| commit | d3f25b3dfe25b7b4a39d6f148b616e9be6ba1347 (patch) | |
| tree | 46adee9ad3c163e4aaedde22b6b82d3210de6e4a /test/cpp/end2end/generic_end2end_test.cc | |
| parent | 6c8492de8a27b3b6afa3533543eeac167b5c94cc (diff) | |
| parent | b37ace5d279925ecd7f8dd6dca03e20cb066ae50 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove_fake_resolver
Diffstat (limited to 'test/cpp/end2end/generic_end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/generic_end2end_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index 57efa5fa17..25c221bb2b 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -75,7 +75,7 @@ class GenericEnd2endTest : public ::testing::Test { protected: GenericEnd2endTest() : server_host_("localhost") {} - void SetUp() GRPC_OVERRIDE { + void SetUp() override { int port = grpc_pick_unused_port_or_die(); server_address_ << server_host_ << ":" << port; // Setup server @@ -91,7 +91,7 @@ class GenericEnd2endTest : public ::testing::Test { server_ = builder.BuildAndStart(); } - void TearDown() GRPC_OVERRIDE { + void TearDown() override { server_->Shutdown(); void* ignored_tag; bool ignored_ok; |