Merge "Hacking Checks for assertTrue/IsNone()"

diff --cc cinder/tests/unit/api/contrib/test_admin_actions.py
Simple merge

diff --cc cinder/tests/unit/api/v1/test_volumes.py
Simple merge

diff --cc cinder/tests/unit/api/v2/test_volumes.py
Simple merge

diff --cc cinder/tests/unit/scheduler/test_host_manager.py
Simple merge

diff --cc cinder/tests/unit/test_backup.py
Simple merge

diff --cc cinder/tests/unit/test_gpfs.py
Simple merge

diff --cc cinder/tests/unit/test_hpe3par.py
index fe8b4215b646e19bd1837339aec6b2fb59d4c9cb,5ddd34783e92f852932ec677013177d45000f826..970beeecbbf42ac62c0483ceff545d0560b72de1
--- 1/cinder/tests/unit/test_hpe3par.py
--- 2/cinder/tests/unit/test_hpe3par.py
+++ b/cinder/tests/unit/test_hpe3par.py
@@@ -1990,13 -1969,13 +1990,13 @@@ class HPE3PARBaseDriver(object)
              model_update = self.driver.create_volume_from_snapshot(
                  volume,
                  self.snapshot)
-             self.assertEqual(None, model_update)
+             self.assertIsNone(model_update)
  
 -            comment = (
 -                '{"snapshot_id": "2f823bdc-e36e-4dc8-bd15-de1c7a28ff31",'
 -                ' "display_name": "Foo Volume",'
 -                ' "volume_id": "d03338a9-9115-48a3-8dfc-35cdfcdc15a7"}')
 -
 +            comment = Comment({
 +                "snapshot_id": "2f823bdc-e36e-4dc8-bd15-de1c7a28ff31",
 +                "display_name": "Foo Volume",
 +                "volume_id": "d03338a9-9115-48a3-8dfc-35cdfcdc15a7",
 +            })
              volume_name_3par = common._encode_name(volume['id'])
              osv_matcher = 'osv-' + volume_name_3par
              omv_matcher = 'omv-' + volume_name_3par
@@@ -2055,13 -2034,12 +2055,13 @@@
              model_update = self.driver.create_volume_from_snapshot(
                  volume,
                  self.snapshot)
-             self.assertEqual(None, model_update)
+             self.assertIsNone(model_update)
  
 -            comment = (
 -                '{"snapshot_id": "2f823bdc-e36e-4dc8-bd15-de1c7a28ff31",'
 -                ' "display_name": "Foo Volume",'
 -                ' "volume_id": "d03338a9-9115-48a3-8dfc-35cdfcdc15a7"}')
 +            comment = Comment({
 +                "snapshot_id": "2f823bdc-e36e-4dc8-bd15-de1c7a28ff31",
 +                "display_name": "Foo Volume",
 +                "volume_id": "d03338a9-9115-48a3-8dfc-35cdfcdc15a7",
 +            })
  
              volume_name_3par = common._encode_name(volume['id'])
              osv_matcher = 'osv-' + volume_name_3par

diff --cc cinder/tests/unit/test_ibm_flashsystem.py
Simple merge

diff --cc cinder/tests/unit/test_ibm_flashsystem_iscsi.py
Simple merge

diff --cc cinder/tests/unit/test_storwize_svc.py
Simple merge

diff --cc cinder/tests/unit/test_vmware_vmdk.py
Simple merge