Merge "Use assertGreater()"

designate/tests/test_central/test_service.py

@@ -805,7 +805,7 @@ class CentralServiceTest(CentralTestCase):
         servers = self.central_service.get_zone_ns_records(
             self.admin_context, zone['id'])
 
-        self.assertTrue(len(servers) > 0)
+        self.assertGreater(len(servers), 0)
 
     def test_find_zone(self):
         # Create a zone
@@ -843,7 +843,7 @@ class CentralServiceTest(CentralTestCase):
             self.admin_context, zone.id)
 
         # Ensure the zone was updated correctly
-        self.assertTrue(zone.serial > original_serial)
+        self.assertGreater(zone.serial, original_serial)
         self.assertEqual('info@example.net', zone.email)
 
         self.assertEqual(2, mock_notifier.call_count)
@@ -925,7 +925,7 @@ class CentralServiceTest(CentralTestCase):
         self.assertTrue(i[0])
 
         # Ensure the zone was updated correctly
-        self.assertTrue(zone.serial > original_serial)
+        self.assertGreater(zone.serial, original_serial)
         self.assertEqual('info@example.net', zone.email)
 
     @mock.patch.object(notifier.Notifier, "info")
@@ -1285,7 +1285,7 @@ class CentralServiceTest(CentralTestCase):
             self.admin_context, expected_zone['id'])
 
         # Ensure the serial was incremented
-        self.assertTrue(zone['serial'] > expected_zone['serial'])
+        self.assertGreater(zone['serial'], expected_zone['serial'])
 
     def test_xfr_zone(self):
         # Create a zone

designate/tests/test_utils.py

@@ -94,7 +94,7 @@ class TestUtils(TestCase):
 
     def test_increment_serial(self):
         ret_serial = utils.increment_serial(serial=20)
-        self.assertTrue(ret_serial > 20)
+        self.assertGreater(ret_serial, 20)
 
     def test_is_uuid_like(self):
         uuid_str = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'

designate/tests/unit/test_objects/test_base.py

@@ -570,7 +570,7 @@ class DesignateObjectTest(oslotest.base.BaseTestCase):
         obj_two.name = 'Other Name'
 
         # Ensure they do not evaluate to equal
-        self.assertTrue(obj_one != obj_two)
+        self.assertNotEqual(obj_one, obj_two)
 
 
 class DictObjectMixinTest(oslotest.base.BaseTestCase):