From a1b0f64bccea682e55ec5086aef979df57cf686f Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 21 Feb 2018 10:01:30 +0100 Subject: Automatically download defcore.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It stops writing files in Functest package dirs and cleans instance variables in refstack modules too. Change-Id: Iaddbe4fbaf12d1af207b86d4e44258efdc6d6f3a Signed-off-by: Cédric Ollivier --- functest/tests/unit/openstack/tempest/test_tempest.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'functest/tests/unit/openstack/tempest/test_tempest.py') diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py index 77cf28af..ba2c1c48 100644 --- a/functest/tests/unit/openstack/tempest/test_tempest.py +++ b/functest/tests/unit/openstack/tempest/test_tempest.py @@ -49,15 +49,6 @@ class OSTempestTesting(unittest.TestCase): self.tempestcustom = tempest.TempestCustom() self.tempestdefcore = tempest.TempestDefcore() - @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug') - def test_gen_tl_defcore_mode(self, mock_logger_debug): - # pylint: disable=unused-argument - self.tempestcommon.mode = 'defcore' - with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' - 'shutil.copyfile') as mock_copyfile: - self.tempestcommon.generate_test_list('test_verifier_repo_dir') - self.assertTrue(mock_copyfile.called) - @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.error') @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug') def test_gen_tl_cm_missing_file(self, mock_logger_debug, @@ -69,7 +60,8 @@ class OSTempestTesting(unittest.TestCase): self.assertRaises(Exception) as context: msg = "Tempest test list file %s NOT found." self.tempestcommon.generate_test_list('test_verifier_repo_dir') - self.assertTrue((msg % conf_utils.TEMPEST_CUSTOM) in context) + self.assertTrue( + (msg % conf_utils.TEMPEST_CUSTOM) in context.exception) def test_gen_tl_cm_default(self): self.tempestcommon.mode = 'custom' -- cgit 1.2.3-korg