From 3406090d516721d7dd2a0e4cffac5a765b74220c Mon Sep 17 00:00:00 2001 From: MinRK Date: Tue, 28 Jun 2011 15:26:47 -0700 Subject: [PATCH] don't reuse connection files in parallel tests --- IPython/parallel/tests/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/IPython/parallel/tests/__init__.py b/IPython/parallel/tests/__init__.py index ba674831ce5..3e740f95a74 100644 --- a/IPython/parallel/tests/__init__.py +++ b/IPython/parallel/tests/__init__.py @@ -46,14 +46,18 @@ def start(self): # nose setup/teardown def setup(): + cluster_dir = os.path.join(get_ipython_dir(), 'profile_iptest') + engine_json = os.path.join(cluster_dir, 'security', 'ipcontroller-engine.json') + client_json = os.path.join(cluster_dir, 'security', 'ipcontroller-client.json') + for json in (engine_json, client_json): + if os.path.exists(json): + os.remove(json) + cp = TestProcessLauncher() cp.cmd_and_args = ipcontroller_cmd_argv + \ - ['profile=iptest', 'log_level=50', '--reuse'] + ['profile=iptest', 'log_level=50'] cp.start() launchers.append(cp) - cluster_dir = os.path.join(get_ipython_dir(), 'profile_iptest') - engine_json = os.path.join(cluster_dir, 'security', 'ipcontroller-engine.json') - client_json = os.path.join(cluster_dir, 'security', 'ipcontroller-client.json') tic = time.time() while not os.path.exists(engine_json) or not os.path.exists(client_json): if cp.poll() is not None: