Merge "Fix invalid assertIsNone states"

Author: Zuul

nova/tests/functional/db/test_compute_node.py

@@ -106,7 +106,7 @@ def _create_zero_and_none_cn(self):
                                 'ram_allocation_ratio': None})
         cn2_db = db.compute_node_get(self.context, cn2.id)
         for x in ['cpu', 'disk', 'ram']:
-            self.assertIsNone(None, cn2_db['%s_allocation_ratio' % x])
+            self.assertIsNone(cn2_db['%s_allocation_ratio' % x])
 
     def test_get_all_by_uuids(self):
         cn1 = fake_compute_obj.obj_clone()

nova/tests/unit/objects/test_instance_pci_requests.py

@@ -123,7 +123,7 @@ def test_obj_from_db(self):
         self.assertEqual(2, len(req.requests))
         self.assertEqual('alias_1', req.requests[0].alias_name)
         self.assertEqual('preferred', req.requests[0].numa_policy)
-        self.assertIsNone(None, req.requests[0].requester_id)
+        self.assertIsNone(req.requests[0].requester_id)
         self.assertEqual(uuids.requester_id, req.requests[1].requester_id)
 
     def test_from_request_spec_instance_props(self):