From b9b2048c676ecfba9e6487c75265305528991a66 Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Wed, 20 Feb 2019 13:53:43 +0100 Subject: [PATCH] testnode: avoid to rebuild testnode dependencies (firefox) all the time (fix tests) --- erp5/tests/testERP5TestNode.py | 8 ++++++-- erp5/util/testnode/testnode.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/erp5/tests/testERP5TestNode.py b/erp5/tests/testERP5TestNode.py index a86dc47992..dc1241702e 100644 --- a/erp5/tests/testERP5TestNode.py +++ b/erp5/tests/testERP5TestNode.py @@ -720,9 +720,11 @@ shared = true # TestNode test_node = self.getTestNode() # Modify class UnitTestRunner(or more after) method + def patch_prepareSlapOS(*args, **kw): + return {'status_code':0} original_prepareSlapOS = RunnerClass._prepareSlapOS original_runTestSuite = RunnerClass.runTestSuite - RunnerClass._prepareSlapOS = doNothing + RunnerClass._prepareSlapOS = patch_prepareSlapOS RunnerClass.runTestSuite = patch_runTestSuite SlapOSControler.initializeSlapOSControler = doNothing # Inside test_node a runner is created using new UnitTestRunner methods @@ -886,7 +888,9 @@ shared = true else: RunnerClass.runTestSuite = doNothing - RunnerClass._prepareSlapOS = doNothing + def patch_prepareSlapOS(*args, **kw): + return {'status_code':0} + RunnerClass._prepareSlapOS = patch_prepareSlapOS SlapOSControler.initializeSlapOSControler = doNothing test_node.run() self.assertEquals(counter, 3) diff --git a/erp5/util/testnode/testnode.py b/erp5/util/testnode/testnode.py index 2e9f8bfc6a..763e91c463 100644 --- a/erp5/util/testnode/testnode.py +++ b/erp5/util/testnode/testnode.py @@ -302,8 +302,8 @@ shared = true runner = runner_class(self) logger.info("Type of current test is %s", my_test_type) # master testnode gets test_suites, slaves get nothing + testnode_software_status_dict = runner.prepareSlapOSForTestNode(test_node_slapos) if not(testnode_software_successfully_built): - testnode_software_status_dict = runner.prepareSlapOSForTestNode(test_node_slapos) if testnode_software_status_dict['status_code'] == 0: testnode_software_successfully_built = True logger.info("Will now skip build of testnode software") -- 2.30.9