X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/420e857f8e8ac75beca258fa72b9edac680500cd..4823a1b88754ef8dc3a4fe3fcb549cb4e6f34246:/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 28cb0953f3..2bb20ca5da 100644 --- a/sdk/python/tests/run_test_server.py +++ b/sdk/python/tests/run_test_server.py @@ -660,6 +660,7 @@ def run_nginx(): nginxconf['ACCESSLOG'] = _logfilename('nginx_access') nginxconf['ERRORLOG'] = _logfilename('nginx_error') nginxconf['TMPDIR'] = TEST_TMPDIR + '/nginx' + nginxconf['INTERNALSUBNETS'] = '169.254.0.0/16 0;' conftemplatefile = os.path.join(MY_DIRNAME, 'nginx.conf') conffile = os.path.join(TEST_TMPDIR, 'nginx.conf') @@ -831,6 +832,10 @@ def setup_config(): "JobsAPI": { "GitInternalDir": os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'internal.git'), }, + "LocalKeepBlobBuffersPerVCPU": 0, + "Logging": { + "SweepInterval": 0, # disable, otherwise test cases can't acquire dblock + }, "SupportedDockerImageFormats": {"v1": {}}, "ShellAccess": { "Admin": True, @@ -924,7 +929,6 @@ class TestCaseWithServers(unittest.TestCase): cls._orig_config = arvados.config.settings().copy() cls._cleanup_funcs = [] 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), (cls.WS_SERVER, run_ws, stop_ws),