From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 1 Mar 2016 23:37:46 +0000 (+0000)
Subject: Merge "Huawei: Code cleanup"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3802df4034055a8d108d2f0c97d3340473bd2600;p=openstack-build%2Fcinder-build.git

Merge "Huawei: Code cleanup"
---

3802df4034055a8d108d2f0c97d3340473bd2600
diff --cc cinder/tests/unit/test_huawei_drivers.py
index ce58d7dd9,237fe8a47..e5b173ed6
--- a/cinder/tests/unit/test_huawei_drivers.py
+++ b/cinder/tests/unit/test_huawei_drivers.py
@@@ -2100,24 -2040,7 +2030,22 @@@ class HuaweiISCSIDriverTestCase(test.Te
          self.driver.client.test_fail = True
          self.driver.delete_volume(test_snap)
  
 +    def test_delete_snapshot_with_snapshot_nonexistent(self):
 +        fake_snap = {
 +            'name': 'volume-21ec7341-9256-497b-97d9-ef48edcf0635',
 +            'size': 1,
 +            'volume_name': 'vol1',
 +            'id': '21ec7341-9256-497b-97d9-ef48edcf0635',
 +            'volume_id': '21ec7341-9256-497b-97d9-ef48edcf0635',
 +            'provider_auth': None,
 +            'project_id': 'project',
 +            'display_name': 'vol1',
 +            'display_description': 'test volume',
 +            'volume_type_id': None,
 +            'provider_location': None, }
 +        self.driver.delete_snapshot(fake_snap)
 +
      def test_initialize_connection_fail(self):
- 
          self.driver.client.test_fail = True
  
          self.assertRaises(exception.VolumeBackendAPIException,