diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-02 12:09:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-02 12:09:03 +0000 |
| commit | f688bb22c83a1aa11bb6c893c62c96be7dfb7dcc (patch) | |
| tree | 6543ada855d5859b30de980a4da5ea53940b2938 | |
| parent | 4393eff80f276f048afe1fb76766ed15d091e00f (diff) | |
| parent | 77d9f412d23c567a0b75550808081e52b6a74605 (diff) | |
| download | designate-3.0.0.0b1.tar.gz | |
Merge "Modify assert statement when comparing with None"3.0.0.0b1
4 files changed, 6 insertions, 6 deletions
diff --git a/designate/tests/test_api/test_v2/test_service_status.py b/designate/tests/test_api/test_v2/test_service_status.py index 5877fc88..cce47068 100644 --- a/designate/tests/test_api/test_v2/test_service_status.py +++ b/designate/tests/test_api/test_v2/test_service_status.py @@ -77,7 +77,7 @@ class ApiV2ServiceStatusTest(ApiV2TestCase): response.json['capabilities']) self.assertEqual(fixture['stats'], response.json['stats']) self.assertEqual(fixture['status'], response.json['status']) - self.assertEqual(None, response.json['heartbeated_at']) + self.assertIsNone(response.json['heartbeated_at']) def test_get_service_status_invalid_id(self): self.policy({'find_service_status': '@'}) diff --git a/designate/tests/unit/test_agent/test_backends/test_knot2.py b/designate/tests/unit/test_agent/test_backends/test_knot2.py index d315bee5..3d5bdb2d 100644 --- a/designate/tests/unit/test_agent/test_backends/test_knot2.py +++ b/designate/tests/unit/test_agent/test_backends/test_knot2.py @@ -158,7 +158,7 @@ class Knot2AgentBackendUnitTestCase(TestCase): mock_exe.side_effect = ProcessExecutionError( "error: [example.com.] (no such zone found)") serial = self.kb.find_zone_serial('example.com') - self.assertEqual(None, serial) + self.assertIsNone(serial) @mock.patch('designate.backend.agent_backend.impl_knot2.execute') def test_find_zone_serial_unexpected_output(self, mock_exe): diff --git a/designate/tests/unit/test_backend/test_agent.py b/designate/tests/unit/test_backend/test_agent.py index f34b5d0b..b18eb8cb 100644 --- a/designate/tests/unit/test_backend/test_agent.py +++ b/designate/tests/unit/test_backend/test_agent.py @@ -65,7 +65,7 @@ class BackendAgentTest(base.BaseTestCase): self.agent._make_and_send_dns_message.assert_called_with( 'zn', 1, 14, pcodes.CREATE, pcodes.SUCCESS, 2, 3) - self.assertEqual(None, out) + self.assertIsNone(out) def test_create_zone_exception(self, *mock): self.agent._make_and_send_dns_message = Mock(return_value=(None, 2)) @@ -84,7 +84,7 @@ class BackendAgentTest(base.BaseTestCase): self.agent.mdns_api.notify_zone_changed.assert_called_with( 'ctx', zone, 2, 3, 1, 4, 5, 6) - self.assertEqual(None, out) + self.assertIsNone(out) def test_delete_zone(self, *mock): self.agent._make_and_send_dns_message = Mock(return_value=(1, 2)) @@ -93,7 +93,7 @@ class BackendAgentTest(base.BaseTestCase): self.agent._make_and_send_dns_message.assert_called_with( 'zn', 1, 14, pcodes.DELETE, pcodes.SUCCESS, 2, 3) - self.assertEqual(None, out) + self.assertIsNone(out) def test_delete_zone_exception(self, *mock): self.agent._make_and_send_dns_message = Mock(return_value=(None, 2)) diff --git a/designate/tests/unit/test_mdns/test_handler.py b/designate/tests/unit/test_mdns/test_handler.py index dd18b109..5f34ae5c 100644 --- a/designate/tests/unit/test_mdns/test_handler.py +++ b/designate/tests/unit/test_mdns/test_handler.py @@ -120,7 +120,7 @@ class TestRequestHandlerCall(unittest.TestCase): ) r_rrset = self.handler._convert_to_rrset(zone, recordset) - self.assertEqual(None, r_rrset) + self.assertIsNone(r_rrset) def test__convert_to_rrset(self): zone = objects.Zone.from_dict({'ttl': 1234}) |