From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 26 Nov 2015 15:54:58 +0000 (+0000)
Subject: Merge "Hacking Checks for assertTrue/IsNone()"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=638fd0f8e05e2eca72f6498e76abf7dbac2cd1be;p=openstack-build%2Fcinder-build.git

Merge "Hacking Checks for assertTrue/IsNone()"
---

638fd0f8e05e2eca72f6498e76abf7dbac2cd1be
diff --cc cinder/tests/unit/test_hpe3par.py
index fe8b4215b,5ddd34783..970beeecb
--- a/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