Fix unit-tests for api

This commit is contained in:
Alexander Kukushkin
2016-08-29 10:25:46 +02:00
parent 3d1fe3fa49
commit 9fdd021e08
+10 -15
View File
@@ -39,10 +39,6 @@ class MockHa(object):
state_handler = MockPostgresql() state_handler = MockPostgresql()
@staticmethod
def is_paused():
return False
@staticmethod @staticmethod
def schedule_reinitialize(): def schedule_reinitialize():
return 'reinitialize' return 'reinitialize'
@@ -183,7 +179,9 @@ class TestRestApiHandler(unittest.TestCase):
MockRestApiServer(RestApiHandler, 'POST /reload HTTP/1.0' + self._authorization) MockRestApiServer(RestApiHandler, 'POST /reload HTTP/1.0' + self._authorization)
self.assertIsNotNone(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 request = 'POST /restart HTTP/1.0' + self._authorization
self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) self.assertIsNotNone(MockRestApiServer(RestApiHandler, request))
@@ -225,9 +223,8 @@ class TestRestApiHandler(unittest.TestCase):
request = make_request(role='master', postgres_version='9.5.2') request = make_request(role='master', postgres_version='9.5.2')
MockRestApiServer(RestApiHandler, request) MockRestApiServer(RestApiHandler, request)
with patch.object(MockHa, 'is_paused', Mock(return_value=True)): mock_dcs.get_cluster.return_value.is_paused.return_value = True
request = make_request(schedule='2016-08-42 12:45TZ+1', role='master') MockRestApiServer(RestApiHandler, make_request(schedule='2016-08-42 12:45TZ+1', role='master'))
MockRestApiServer(RestApiHandler, request)
def test_do_DELETE_restart(self): def test_do_DELETE_restart(self):
for retval in (True, False): for retval in (True, False):
@@ -236,8 +233,9 @@ class TestRestApiHandler(unittest.TestCase):
self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) self.assertIsNotNone(MockRestApiServer(RestApiHandler, request))
@patch.object(MockPatroni, 'dcs') @patch.object(MockPatroni, 'dcs')
def test_do_POST_reinitialize(self, dcs): def test_do_POST_reinitialize(self, mock_dcs):
cluster = dcs.get_cluster.return_value cluster = mock_dcs.get_cluster.return_value
cluster.is_paused.return_value = False
request = 'POST /reinitialize HTTP/1.0' + self._authorization request = 'POST /reinitialize HTTP/1.0' + self._authorization
MockRestApiServer(RestApiHandler, request) MockRestApiServer(RestApiHandler, request)
cluster.is_unlocked.return_value = False cluster.is_unlocked.return_value = False
@@ -247,8 +245,8 @@ class TestRestApiHandler(unittest.TestCase):
cluster.leader.name = 'test' cluster.leader.name = 'test'
self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) self.assertIsNotNone(MockRestApiServer(RestApiHandler, request))
with patch.object(MockHa, 'is_paused', Mock(return_value=True)): cluster.is_paused.return_value = True
self.assertIsNotNone(MockRestApiServer(RestApiHandler, request)) self.assertIsNotNone(MockRestApiServer(RestApiHandler, request))
@patch('time.sleep', Mock()) @patch('time.sleep', Mock())
def test_RestApiServer_query(self): def test_RestApiServer_query(self):
@@ -317,9 +315,6 @@ class TestRestApiHandler(unittest.TestCase):
d.manual_failover.return_value = False d.manual_failover.return_value = False
MockRestApiServer(RestApiHandler, request) MockRestApiServer(RestApiHandler, request)
with patch.object(MockHa, 'is_paused', Mock(return_value=True)):
MockRestApiServer(RestApiHandler, request)
# Exception: No timezone specified # Exception: No timezone specified
request = post + '97\n\n{"leader": "postgresql1", "member": "postgresql2",' +\ request = post + '97\n\n{"leader": "postgresql1", "member": "postgresql2",' +\
' "scheduled_at": "6016-02-15T18:13:30.568224"}' ' "scheduled_at": "6016-02-15T18:13:30.568224"}'