##// END OF EJS Templates
don't reuse connection files in parallel tests
MinRK -
Show More
@@ -46,14 +46,18 b' class TestProcessLauncher(LocalProcessLauncher):'
46 # nose setup/teardown
46 # nose setup/teardown
47
47
48 def setup():
48 def setup():
49 cluster_dir = os.path.join(get_ipython_dir(), 'profile_iptest')
50 engine_json = os.path.join(cluster_dir, 'security', 'ipcontroller-engine.json')
51 client_json = os.path.join(cluster_dir, 'security', 'ipcontroller-client.json')
52 for json in (engine_json, client_json):
53 if os.path.exists(json):
54 os.remove(json)
55
49 cp = TestProcessLauncher()
56 cp = TestProcessLauncher()
50 cp.cmd_and_args = ipcontroller_cmd_argv + \
57 cp.cmd_and_args = ipcontroller_cmd_argv + \
51 ['profile=iptest', 'log_level=50', '--reuse']
58 ['profile=iptest', 'log_level=50']
52 cp.start()
59 cp.start()
53 launchers.append(cp)
60 launchers.append(cp)
54 cluster_dir = os.path.join(get_ipython_dir(), 'profile_iptest')
55 engine_json = os.path.join(cluster_dir, 'security', 'ipcontroller-engine.json')
56 client_json = os.path.join(cluster_dir, 'security', 'ipcontroller-client.json')
57 tic = time.time()
61 tic = time.time()
58 while not os.path.exists(engine_json) or not os.path.exists(client_json):
62 while not os.path.exists(engine_json) or not os.path.exists(client_json):
59 if cp.poll() is not None:
63 if cp.poll() is not None:
General Comments 0
You need to be logged in to leave comments. Login now