projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9848-copy-container-output' refs #9848
[arvados.git]
/
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 45cc3ca32b465ed96989e910189b6f0de9fb2f8d..e72f67dce49049f37c9b2e68794eb62cc780297c 100644
(file)
--- a/
sdk/python/tests/run_test_server.py
+++ b/
sdk/python/tests/run_test_server.py
@@
-476,7
+476,7
@@
def run_keep_proxy():
'service_type': 'proxy',
'service_ssl_flag': False,
}}).execute()
'service_type': 'proxy',
'service_ssl_flag': False,
}}).execute()
- os.environ["ARVADOS_KEEP_
PROXY
"] = "http://localhost:{}".format(port)
+ os.environ["ARVADOS_KEEP_
SERVICES
"] = "http://localhost:{}".format(port)
_setport('keepproxy', port)
_wait_until_port_listens(port)
_setport('keepproxy', port)
_wait_until_port_listens(port)
@@
-664,7
+664,7
@@
class TestCaseWithServers(unittest.TestCase):
cls._orig_environ = os.environ.copy()
cls._orig_config = arvados.config.settings().copy()
cls._cleanup_funcs = []
cls._orig_environ = os.environ.copy()
cls._orig_config = arvados.config.settings().copy()
cls._cleanup_funcs = []
- os.environ.pop('ARVADOS_KEEP_
PROXY
', None)
+ os.environ.pop('ARVADOS_KEEP_
SERVICES
', None)
os.environ.pop('ARVADOS_EXTERNAL_CLIENT', None)
for server_kwargs, start_func, stop_func in (
(cls.MAIN_SERVER, run, reset),
os.environ.pop('ARVADOS_EXTERNAL_CLIENT', None)
for server_kwargs, start_func, stop_func in (
(cls.MAIN_SERVER, run, reset),