From e8eac7e562f592095f8aa87bdb1f95cbfeac88d7 Mon Sep 17 00:00:00 2001 From: Sergey Vilgelm Date: Sun, 26 Jul 2015 16:33:43 +0000 Subject: [PATCH] Fix the unit tests with wrong usage of mock Replace assert_called_once() with self.assertEqual(1, <...>.call_count). Change-Id: Ied357c86ba7d62c419d01a75b099a6c5de479d6e Closes-Bug: 1473369 --- tuskar/tests/api/controllers/v1/test_overcloud.py | 2 +- tuskar/tests/api/controllers/v1/test_overcloud_roles.py | 2 +- tuskar/tests/api/controllers/v2/test_plans.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tuskar/tests/api/controllers/v1/test_overcloud.py b/tuskar/tests/api/controllers/v1/test_overcloud.py index 7385b378..b8da7ca2 100644 --- a/tuskar/tests/api/controllers/v1/test_overcloud.py +++ b/tuskar/tests/api/controllers/v1/test_overcloud.py @@ -58,7 +58,7 @@ class OvercloudTests(base.TestCase): self.assertEqual(result[0]['attributes']['password'], '******') self.assertEqual(result[0]['attributes']['AdminPassword'], '******') - mock_db_get.assert_called_once() + self.assertEqual(1, mock_db_get.call_count) @mock.patch('tuskar.db.sqlalchemy.api.' 'Connection.get_overcloud_by_id') diff --git a/tuskar/tests/api/controllers/v1/test_overcloud_roles.py b/tuskar/tests/api/controllers/v1/test_overcloud_roles.py index 75d588b3..f4b0d990 100644 --- a/tuskar/tests/api/controllers/v1/test_overcloud_roles.py +++ b/tuskar/tests/api/controllers/v1/test_overcloud_roles.py @@ -48,7 +48,7 @@ class OvercloudRolesTests(base.TestCase): self.assertEqual(1, len(result)) self.assertEqual(result[0]['name'], 'foo') - mock_db_get.assert_called_once() + self.assertEqual(1, mock_db_get.call_count) @mock.patch('tuskar.db.sqlalchemy.api.' 'Connection.get_overcloud_role_by_id') diff --git a/tuskar/tests/api/controllers/v2/test_plans.py b/tuskar/tests/api/controllers/v2/test_plans.py index 3f206604..9217756c 100644 --- a/tuskar/tests/api/controllers/v2/test_plans.py +++ b/tuskar/tests/api/controllers/v2/test_plans.py @@ -47,7 +47,7 @@ class PlansTests(base.TestCase): result = response.json # Verify - mock_list.assert_called_once() + self.assertEqual(1, mock_list.call_count) self.assertEqual(response.status_int, 200) self.assertTrue(isinstance(result, list)) self.assertEqual(2, len(result)) @@ -64,7 +64,7 @@ class PlansTests(base.TestCase): result = response.json # Verify - mock_list.assert_called_once() + self.assertEqual(1, mock_list.call_count) self.assertEqual(response.status_int, 200) self.assertTrue(isinstance(result, list)) self.assertEqual(0, len(result)) @@ -239,7 +239,7 @@ class PlansTests(base.TestCase): result = response.json # Verify - mock_set.assert_called_once() + self.assertEqual(1, mock_set.call_count) self.assertEqual(mock_set.call_args[0][0], 'qwerty12345') self.assertEqual(mock_set.call_args[0][1][0].name, 'foo') self.assertEqual(mock_set.call_args[0][1][0].value, 'bar')