Fix hacking rule of assert_equal_or_not_none

The rule is not robust enough result in error code existing.
Fix the code and the rule.

Change-Id: I68934d4931a6e7857a824d0af5ed571a9c3e6480
Closes-bug: #1280522

octavia/hacking/checks.py

@@ -67,14 +67,12 @@ assert_equal_with_true_re = re.compile(
 assert_equal_with_false_re = re.compile(
     r"assertEqual\(False,")
 mutable_default_args = re.compile(r"^\s*def .+\((.+=\{\}|.+=\[\])")
-assert_equal_end_with_none_re = re.compile(
-    r"(.)*assertEqual\((\w|\.|\'|\"|\[|\])+, None\)")
-assert_equal_start_with_none_re = re.compile(
-    r"(.)*assertEqual\(None, (\w|\.|\'|\"|\[|\])+\)")
+assert_equal_end_with_none_re = re.compile(r"(.)*assertEqual\(.+, None\)")
+assert_equal_start_with_none_re = re.compile(r".*assertEqual\(None, .+\)")
 assert_not_equal_end_with_none_re = re.compile(
-    r"(.)*assertNotEqual\((\w|\.|\'|\"|\[|\])+, None\)")
+    r"(.)*assertNotEqual\(.+, None\)")
 assert_not_equal_start_with_none_re = re.compile(
-    r"(.)*assertNotEqual\(None, (\w|\.|\'|\"|\[|\])+\)")
+    r"(.)*assertNotEqual\(None, .+\)")
 
 
 def _directory_to_check_translation(filename):

octavia/tests/unit/cmd/test_house_keeping.py

@@ -110,7 +110,7 @@ class TestHouseKeepingCMD(base.TestCase):
         cert_rotate_event_mock.is_set = mock.MagicMock()
         cert_rotate_event_mock.is_set.side_effect = [True, None]
 
-        self.assertEqual(None, house_keeping.cert_rotation())
+        self.assertIsNone(house_keeping.cert_rotation())
 
         mock_CertRotation.assert_called_once_with()
         self.assertEqual(1, cert_rotate_mock.rotate.call_count)

octavia/tests/unit/controller/housekeeping/test_house_keeping.py

@@ -175,7 +175,7 @@ class TestCertRotation(base.TestCase):
 
         cr = house_keeping.CertRotation()
 
-        self.assertEqual(None, cr.rotate())
+        self.assertIsNone(cr.rotate())
         amp_cert_mock.assert_called_once_with(AMPHORA_ID)
 
     @mock.patch('octavia.controller.worker.controller_worker.'