X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c68e4ba51336a871dff26ae9f8dc7eb7e316083d..8e7e7f4a4972c44f2f4a4692953bfbe35ebcdf84:/sdk/python/tests/run_test_server.py diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py index a5dd88a9c5..787837b723 100644 --- a/sdk/python/tests/run_test_server.py +++ b/sdk/python/tests/run_test_server.py @@ -2,10 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -from __future__ import print_function -from __future__ import division -from builtins import str -from builtins import range import argparse import atexit import errno @@ -18,7 +14,6 @@ import shlex import shutil import signal import socket -import string import subprocess import sys import tempfile @@ -26,10 +21,7 @@ import time import unittest import yaml -try: - from urllib.parse import urlparse -except ImportError: - from urlparse import urlparse +from urllib.parse import urlparse MY_DIRNAME = os.path.dirname(os.path.realpath(__file__)) if __name__ == '__main__' and os.path.exists( @@ -670,7 +662,6 @@ def run_nginx(): nginxconf['HEALTHSSLPORT'] = external_port_from_config("Health") nginxconf['WSPORT'] = internal_port_from_config("Websocket") nginxconf['WSSSLPORT'] = external_port_from_config("Websocket") - nginxconf['WORKBENCH1PORT'] = internal_port_from_config("Workbench1") nginxconf['WORKBENCH1SSLPORT'] = external_port_from_config("Workbench1") nginxconf['WORKBENCH2PORT'] = internal_port_from_config("Workbench2") nginxconf['WORKBENCH2SSLPORT'] = external_port_from_config("Workbench2") @@ -706,7 +697,6 @@ def setup_config(): controller_external_port = find_available_port() websocket_port = find_available_port() websocket_external_port = find_available_port() - workbench1_port = find_available_port() workbench1_external_port = find_available_port() workbench2_port = find_available_port() workbench2_external_port = find_available_port() @@ -758,9 +748,6 @@ def setup_config(): }, "Workbench1": { "ExternalURL": "https://%s:%s/" % (localhost, workbench1_external_port), - "InternalURLs": { - "http://%s:%s"%(localhost, workbench1_port): {}, - }, }, "Workbench2": { "ExternalURL": "https://%s:%s/" % (localhost, workbench2_external_port),