diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-12 04:30:57 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-12 04:30:57 +0200 |
| commit | 1c41c29c268f4fb01a755e344d16940f73c29d46 (patch) | |
| tree | 88675ad0f5820143d3d805d166a172e98d7771ef /tools/run_tests/run_tests.py | |
| parent | 2b98c8838d2035296b9cb016fc9af2bb8a987d90 (diff) | |
| parent | 5bcd4a64ee74fe372584e477c3ebd5a3dc341055 (diff) | |
Merge branch 'release-0_15' into upmerge-master
Conflicts:
Makefile
build.yaml
gRPC-Core.podspec
gRPC.podspec
package.json
package.xml
src/core/lib/surface/version.c
src/csharp/Grpc.Auth/project.json
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Core/project.json
src/csharp/Grpc.HealthCheck/project.json
src/csharp/build_packages.bat
src/node/tools/package.json
src/python/grpcio/grpc/__init__.py
src/python/grpcio/grpc_version.py
src/python/grpcio_tests/tests/unit/_rpc_test.py
src/ruby/lib/grpc/version.rb
src/ruby/tools/version.rb
templates/gRPC.podspec.template
tools/distrib/python/grpcio_tools/grpc_version.py
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
tools/run_tests/port_server.py
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index b0e20698bd..f4fe4cdbbb 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1093,7 +1093,23 @@ def _shut_down_legacy_server(legacy_server_port): 'http://localhost:%d/quitquitquit' % legacy_server_port).read() +def _shut_down_legacy_server(legacy_server_port): + try: + version = int(urllib2.urlopen( + 'http://localhost:%d/version_number' % legacy_server_port, + timeout=10).read()) + except: + pass + else: + urllib2.urlopen( + 'http://localhost:%d/quitquitquit' % legacy_server_port).read() + + 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 |