Merge "Enable a few common hacking checks"

ceilometer/tests/unit/compute/test_discovery.py

@@ -993,4 +993,4 @@ class TestDiscovery(base.BaseTestCase):
         dsc = discovery.InstanceDiscovery(self.CONF)
 
         ret_server = dsc.get_server(uuid)
-        self.assertEqual(None, ret_server)
+        self.assertIsNone(ret_server)

ceilometer/tests/unit/event/test_converter.py

@@ -36,15 +36,15 @@ class ConverterBase(base.BaseTestCase):
                     )
 
     def assertIsValidEvent(self, event, notification):
-        self.assertIsNot(
-            None, event,
+        self.assertIsNotNone(
+            event,
             "Notification dropped unexpectedly:"
             " %s" % str(notification))
         self.assertIsInstance(event, models.Event)
 
     def assertIsNotValidEvent(self, event, notification):
-        self.assertIs(
-            None, event,
+        self.assertIsNone(
+            event,
             "Notification NOT dropped when expected to be dropped:"
             " %s" % str(notification))
 

ceilometer/tests/unit/polling/test_dynamic_pollster.py

@@ -1254,7 +1254,7 @@ class TestDynamicPollster(base.BaseTestCase):
             self.pollster_definition_only_required_fields)
         samples = pollster.get_samples(None, None, None)
 
-        self.assertEqual(None, next(samples))
+        self.assertIsNone(next(samples))
 
     @mock.patch('ceilometer.polling.dynamic_pollster.'
                 'PollsterSampleGatherer.execute_request_get_samples')

tox.ini

@@ -85,6 +85,11 @@ ignore-path = .venv,.git,.tox,*ceilometer/locale*,*lib/python*,ceilometer.egg*,d
 # W504 line break after binary operator
 ignore = E123,W503,W504
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,install-guide
+# [H106] Do not put vim configuration in source files.
+# [H203] Use assertIs(Not)None to check for None.
+# [H204] Use assert(Not)Equal to check for equality.
+# [H205] Use assert(Greater|Less)(Equal) for comparison.
+enable-extensions=H106,H203,H204,H205
 show-source = True
 
 [hacking]