From 08abc173b420237034f5fd100c1f613024830feb Mon Sep 17 00:00:00 2001 From: Alain Takoudjou <alain.takoudjou@nexedi.com> Date: Fri, 30 Mar 2018 09:29:22 +0200 Subject: [PATCH] Revert "Rework eggtest to use eggs installed by buildout" This reverts merge request !619 --- erp5/util/testsuite/__init__.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/erp5/util/testsuite/__init__.py b/erp5/util/testsuite/__init__.py index eb982458c0..b477ab26fb 100644 --- a/erp5/util/testsuite/__init__.py +++ b/erp5/util/testsuite/__init__.py @@ -223,14 +223,16 @@ class EggTestSuite(TestSuite): print test original_dir = os.getcwd() try: - os.chdir(self.egg_test_path_dict[test]) + os.chdir(test) return self.runUnitTest(test) finally: os.chdir(original_dir) def runUnitTest(self, *args, **kw): try: - runUnitTest = "{python} setup.py test".format(python=self.python_interpreter) + # (FIXME) The python should be provided by environment with + # appropriated configuration. + runUnitTest = "python setup.py test" args = tuple(shlex.split(runUnitTest)) status_dict = self.spawn(*args, **kw) except SubprocessError, e: @@ -261,7 +263,10 @@ class EggTestSuite(TestSuite): return status_dict def getTestList(self): - return self.egg_test_path_dict.keys() + # (FIXME) The test name should be nicer in order to provide a good report. + # On task distribution. + source_code_to_test = os.environ.get("SOURCE_CODE_TO_TEST", '.') + return source_code_to_test.split(",") def runTestSuite(): parser = argparse.ArgumentParser(description='Run a test suite.') @@ -282,24 +287,18 @@ def runTestSuite(): parser.add_argument('--frontend_url', help='The url of the frontend of this test node', default=None) - parser.add_argument('--python_interpreter', - help='Path to python interpreter used to run the test suite', - default='python') parser.add_argument('--source_code_path_list', - help='Coma separated list of Eggs folders to test', + help='List of Eggs folders to test, splited by commam', default='.') args = parser.parse_args() master = taskdistribution.TaskDistributor(args.master_url) + os.environ.setdefault("SOURCE_CODE_TO_TEST", args.source_code_path_list) test_suite_title = args.test_suite_title or args.test_suite revision = args.revision suite = EggTestSuite(1, test_suite=args.test_suite, node_quantity=args.node_quantity, - revision=revision, - python_interpreter=args.python_interpreter, - egg_test_path_dict={os.path.basename(path): path - for path in args.source_code_path_list.split(',')}, - ) + revision=revision) test_result = master.createTestResult(revision, suite.getTestList(), args.test_node_title, suite.allow_restart, test_suite_title, -- 2.30.9