From 9fdd021e08cbc7f8a41a72e1ee1f518a485f2c35 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Mon, 29 Aug 2016 10:25:46 +0200 Subject: [PATCH] Fix unit-tests for api --- tests/test_api.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/test_api.py b/tests/test_api.py index 83aff049..ad96ed87 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -39,10 +39,6 @@ class MockHa(object): state_handler = MockPostgresql() - @staticmethod - def is_paused(): - return False - @staticmethod def schedule_reinitialize(): return 'reinitialize' @@ -183,7 +179,9 @@ class TestRestApiHandler(unittest.TestCase): MockRestApiServer(RestApiHandler, 'POST /reload HTTP/1.0' + self._authorization) self.assertIsNotNone(MockRestApiServer(RestApiHandler, 'POST /reload HTTP/1.0' + self._authorization)) - def test_do_POST_restart(self): + @patch.object(MockPatroni, 'dcs') + def test_do_POST_restart(self, mock_dcs): + mock_dcs.get_cluster.return_value.is_paused.return_value = False request = 'POST /restart HTTP/1.0' + self._authorization self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) @@ -225,9 +223,8 @@ class TestRestApiHandler(unittest.TestCase): request = make_request(role='master', postgres_version='9.5.2') MockRestApiServer(RestApiHandler, request) - with patch.object(MockHa, 'is_paused', Mock(return_value=True)): - request = make_request(schedule='2016-08-42 12:45TZ+1', role='master') - MockRestApiServer(RestApiHandler, request) + mock_dcs.get_cluster.return_value.is_paused.return_value = True + MockRestApiServer(RestApiHandler, make_request(schedule='2016-08-42 12:45TZ+1', role='master')) def test_do_DELETE_restart(self): for retval in (True, False): @@ -236,8 +233,9 @@ class TestRestApiHandler(unittest.TestCase): self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) @patch.object(MockPatroni, 'dcs') - def test_do_POST_reinitialize(self, dcs): - cluster = dcs.get_cluster.return_value + def test_do_POST_reinitialize(self, mock_dcs): + cluster = mock_dcs.get_cluster.return_value + cluster.is_paused.return_value = False request = 'POST /reinitialize HTTP/1.0' + self._authorization MockRestApiServer(RestApiHandler, request) cluster.is_unlocked.return_value = False @@ -247,8 +245,8 @@ class TestRestApiHandler(unittest.TestCase): cluster.leader.name = 'test' self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) - with patch.object(MockHa, 'is_paused', Mock(return_value=True)): - self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) + cluster.is_paused.return_value = True + self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) @patch('time.sleep', Mock()) def test_RestApiServer_query(self): @@ -317,9 +315,6 @@ class TestRestApiHandler(unittest.TestCase): d.manual_failover.return_value = False MockRestApiServer(RestApiHandler, request) - with patch.object(MockHa, 'is_paused', Mock(return_value=True)): - MockRestApiServer(RestApiHandler, request) - # Exception: No timezone specified request = post + '97\n\n{"leader": "postgresql1", "member": "postgresql2",' +\ ' "scheduled_at": "6016-02-15T18:13:30.568224"}'