From 5b2a2fee9ca3a1b36808677eec45f1e686d1c2d0 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Mon, 31 Aug 2020 15:49:14 +0200 Subject: [PATCH] unit_tests: Replace patch decorators with BaseTestCase helpers --- unit_tests/charm_tests/test_utils.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/unit_tests/charm_tests/test_utils.py b/unit_tests/charm_tests/test_utils.py index 2a494d6..8e0661b 100644 --- a/unit_tests/charm_tests/test_utils.py +++ b/unit_tests/charm_tests/test_utils.py @@ -12,10 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import unittest import zaza.openstack.charm_tests.test_utils as test_utils -from unittest.mock import patch +import unit_tests.utils as ut_utils class TestBaseCharmTest(unittest.TestCase): @@ -38,15 +37,16 @@ class TestBaseCharmTest(unittest.TestCase): }), 'aValue') -class TestOpenStackBaseTest(unittest.TestCase): +class TestOpenStackBaseTest(ut_utils.BaseTestCase): - @patch.object(test_utils.openstack_utils, 'get_cacert') - @patch.object(test_utils.openstack_utils, 'get_overcloud_keystone_session') - @patch.object(test_utils.BaseCharmTest, 'setUpClass') - def test_setUpClass(self, _setUpClass, _get_ovcks, _get_cacert): + def test_setUpClass(self): + self.patch_object(test_utils.openstack_utils, 'get_cacert') + self.patch_object(test_utils.openstack_utils, + 'get_overcloud_keystone_session') + self.patch_object(test_utils.BaseCharmTest, 'setUpClass') class MyTestClass(test_utils.OpenStackBaseTest): model_name = 'deadbeef' MyTestClass.setUpClass('foo', 'bar') - _setUpClass.assert_called_with('foo', 'bar') + self.setUpClass.assert_called_with('foo', 'bar')