diff options
author | Adele Zhou <adelez@google.com> | 2017-11-29 16:25:17 -0800 |
---|---|---|
committer | Adele Zhou <adelez@google.com> | 2017-11-30 17:45:02 -0800 |
commit | 5b7cdefb681977357573d9eac866520610d19fa5 (patch) | |
tree | 45411f6060a9c97be5db23f53ef8639b30d7b4a1 /test/core | |
parent | e5df91f477a27ce71a39bca928677b2f08649615 (diff) |
Rename port_hermetic to port_isolated_runtime_environment
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/util/BUILD | 2 | ||||
-rw-r--r-- | test/core/util/port_isolated_runtime_environment.cc (renamed from test/core/util/port_hermetic.cc) | 13 | ||||
-rw-r--r-- | test/core/util/test_config.h | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/test/core/util/BUILD b/test/core/util/BUILD index f92c0ff548..89e07c83c7 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -53,7 +53,7 @@ grpc_cc_library( "parse_hexstring.cc", "passthru_endpoint.cc", "port.cc", - "port_hermetic.cc", + "port_isolated_runtime_environment.cc", "port_server_client.cc", "reconnect_server.cc", "slice_splitter.cc", diff --git a/test/core/util/port_hermetic.cc b/test/core/util/port_isolated_runtime_environment.cc index b4d097f650..5f0585e9fb 100644 --- a/test/core/util/port_hermetic.cc +++ b/test/core/util/port_isolated_runtime_environment.cc @@ -16,13 +16,12 @@ * */ -/* When running tests hermeticly, i.e. running on remote machines, - * the framework takes a round-robin pick of a port within certain range. - * There is no need to recycle ports. +/* When running tests on remote machines, the framework takes a round-robin pick + * of a port within certain range. There is no need to recycle ports. */ #include "src/core/lib/iomgr/port.h" #include "test/core/util/test_config.h" -#if defined(GRPC_HERMETIC_TESTS) +#if defined(GRPC_PORT_ISOLATED_RUNTIME) #include "test/core/util/port.h" @@ -38,8 +37,6 @@ int grpc_pick_unused_port_or_die(void) { return allocated_port; } -void grpc_recycle_unused_port(int port) { - (void) port; -} +void grpc_recycle_unused_port(int port) { (void)port; } -#endif /* GRPC_HERMETIC_TESTS */ +#endif /* GRPC_PORT_ISOLATED_RUNTIME */ diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h index ee60441653..5b3d34799e 100644 --- a/test/core/util/test_config.h +++ b/test/core/util/test_config.h @@ -33,7 +33,7 @@ gpr_timespec grpc_timeout_seconds_to_deadline(int64_t time_s); /* Converts a given timeout (in milliseconds) to a deadline. */ gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms); -#if !defined(GRPC_TEST_CUSTOM_PICK_PORT) && !defined(GRPC_HERMETIC_TESTS) +#if !defined(GRPC_TEST_CUSTOM_PICK_PORT) && !defined(GRPC_PORT_ISOLATED_RUNTIME) #define GRPC_TEST_PICK_PORT #endif |