From 9fd925498cd49d4cd69d86f045e43a71a5f394d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 22 Jul 2011 18:30:20 +0200 Subject: [PATCH] Use runTestSuite not runUnitTest. --- erp5/util/testnode/__init__.py | 4 ++-- erp5/util/testnode/testnode.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/erp5/util/testnode/__init__.py b/erp5/util/testnode/__init__.py index 380d2452da..46ce634e42 100644 --- a/erp5/util/testnode/__init__.py +++ b/erp5/util/testnode/__init__.py @@ -82,8 +82,8 @@ def main(*args): open(CONFIG['slapos_config'], 'w').write(slapos_config) CONFIG['git_binary'] = geto('git_binary') CONFIG['zip_binary'] = geto('zip_binary') - CONFIG['runUnitTest'] = os.path.join(CONFIG['instance_root'], - CONFIG['partition_reference'], 'bin', 'runUnitTest') + CONFIG['runTestSuite'] = os.path.join(CONFIG['instance_root'], + CONFIG['partition_reference'], 'bin', 'runTestSuite') # generate vcs_repository_list vcs_repository_list = [] diff --git a/erp5/util/testnode/testnode.py b/erp5/util/testnode/testnode.py index 9c3171a3d5..8ff2df2121 100644 --- a/erp5/util/testnode/testnode.py +++ b/erp5/util/testnode/testnode.py @@ -219,10 +219,7 @@ branch = %(branch)s retry_software = True raise SubprocessError(status_dict) - partition_path = os.path.join(config['instance_root'], - config['partition_reference']) - run_test_suite_path = os.path.join(partition_path, 'bin', - 'runTestSuite') + run_test_suite_path = config['runTestSuite'] if not os.path.exists(run_test_suite_path): raise SubprocessError({ 'command': 'os.path.exists(run_test_suite_path)', -- 2.30.9