aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-07-12 05:05:41 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-07-12 05:05:41 +0200
commit91833144355ac6b06bba4dc49ee2d2f82efc1324 (patch)
tree8e09e444fc1edf35423040858d356186b29c757d
parent1c41c29c268f4fb01a755e344d16940f73c29d46 (diff)
Addressing comments.
-rw-r--r--src/python/grpcio/grpc/__init__.py2
-rwxr-xr-xtools/run_tests/run_tests.py4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py
index 0fbef03bdf..de18421cf3 100644
--- a/src/python/grpcio/grpc/__init__.py
+++ b/src/python/grpcio/grpc/__init__.py
@@ -1218,7 +1218,7 @@ def server(thread_pool, handlers=None):
thread_pool: A futures.ThreadPoolExecutor to be used by the returned Server
to service RPCs.
handlers: An optional sequence of GenericRpcHandlers to be used to service
- RPCs after the returned Server is started. These andlers need not be the
+ RPCs after the returned Server is started. These handlers need not be the
only handlers the server will use to service RPCs; other handlers may
later be added by calling add_generic_rpc_handlers any time before the
returned Server is started.
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index f4fe4cdbbb..f081887fc0 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1106,10 +1106,6 @@ def _shut_down_legacy_server(legacy_server_port):
def _start_port_server(port_server_port):
- # Temporary patch to switch the port_server port
- # see https://github.com/grpc/grpc/issues/7145
- _shut_down_legacy_server(32767)
-
# check if a compatible port server is running
# if incompatible (version mismatch) ==> start a new one
# if not running ==> start a new one