projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11308: Merge branch 'master' into 11308-python3
[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 d10e60c22fef1009179c90da126d098a2fdc9c56..cca51b8a437e8d8d76c9101e0d2478fb7adc2840 100644
(file)
--- a/
sdk/python/tests/run_test_server.py
+++ b/
sdk/python/tests/run_test_server.py
@@
-1,6
+1,7
@@
-#!/usr/bin/env python
-
from __future__ import print_function
from __future__ import print_function
+from __future__ import division
+from builtins import str
+from builtins import range
import argparse
import atexit
import errno
import argparse
import atexit
import errno
@@
-96,7
+97,7
@@
def kill_server_pid(pidfile, wait=10, passenger_root=False):
# Use up to half of the +wait+ period waiting for "passenger
# stop" to work. If the process hasn't exited by then, start
# sending TERM signals.
# Use up to half of the +wait+ period waiting for "passenger
# stop" to work. If the process hasn't exited by then, start
# sending TERM signals.
- startTERM += wait/2
+ startTERM += wait/
/
2
server_pid = None
while now <= deadline and server_pid is None:
server_pid = None
while now <= deadline and server_pid is None:
@@
-211,7
+212,7
@@
def _fifo2stderr(label):
except OSError as error:
if error.errno != errno.ENOENT:
raise
except OSError as error:
if error.errno != errno.ENOENT:
raise
- os.mkfifo(fifo, 0700)
+ os.mkfifo(fifo, 0
o
700)
subprocess.Popen(
['stdbuf', '-i0', '-oL', '-eL', 'sed', '-e', 's/^/['+label+'] /', fifo],
stdout=sys.stderr)
subprocess.Popen(
['stdbuf', '-i0', '-oL', '-eL', 'sed', '-e', 's/^/['+label+'] /', fifo],
stdout=sys.stderr)
@@
-314,10
+315,7
@@
def run(leave_running_atexit=False):
env = os.environ.copy()
env['RAILS_ENV'] = 'test'
env['ARVADOS_TEST_WSS_PORT'] = str(wss_port)
env = os.environ.copy()
env['RAILS_ENV'] = 'test'
env['ARVADOS_TEST_WSS_PORT'] = str(wss_port)
- if env.get('ARVADOS_TEST_EXPERIMENTAL_WS'):
- env.pop('ARVADOS_WEBSOCKETS', None)
- else:
- env['ARVADOS_WEBSOCKETS'] = 'yes'
+ env.pop('ARVADOS_WEBSOCKETS', None)
env.pop('ARVADOS_TEST_API_HOST', None)
env.pop('ARVADOS_API_HOST', None)
env.pop('ARVADOS_API_HOST_INSECURE', None)
env.pop('ARVADOS_TEST_API_HOST', None)
env.pop('ARVADOS_API_HOST', None)
env.pop('ARVADOS_API_HOST_INSECURE', None)
@@
-439,7
+437,7
@@
def _start_keep(n, keep_args):
"-listen=:{}".format(port),
"-pid="+_pidfile('keep{}'.format(n))]
"-listen=:{}".format(port),
"-pid="+_pidfile('keep{}'.format(n))]
- for arg, val in keep_args.ite
rite
ms():
+ for arg, val in keep_args.items():
keep_cmd.append("{}={}".format(arg, val))
logf = open(_fifo2stderr('keep{}'.format(n)), 'w')
keep_cmd.append("{}={}".format(arg, val))
logf = open(_fifo2stderr('keep{}'.format(n)), 'w')
@@
-736,7
+734,7
@@
class TestCaseWithServers(unittest.TestCase):
@staticmethod
def _restore_dict(src, dest):
@staticmethod
def _restore_dict(src, dest):
- for key in
dest.keys(
):
+ for key in
list(dest.keys()
):
if key not in src:
del dest[key]
dest.update(src)
if key not in src:
del dest[key]
dest.update(src)