Fix pep8 failures in tests for Volume Types and extra specs
This fixes pep8 issues introduced in Change:
I19ff56a434f8cc87089f2488e97701492e47d830
Which didn't comply with TEMPEST N306, N201
Change-Id: I4c31cbdbb9bd288f8f99cf9d68d4d94f9a64bf68
diff --git a/tempest/tests/volume/admin/test_volume_types.py b/tempest/tests/volume/admin/test_volume_types.py
index a065891..224a927 100644
--- a/tempest/tests/volume/admin/test_volume_types.py
+++ b/tempest/tests/volume/admin/test_volume_types.py
@@ -46,7 +46,7 @@
resp, body = self.client.list_volume_types()
self.assertEqual(200, resp.status)
self.assertTrue(type(body), list)
- except:
+ except Exception:
self.fail("Could not list volume types")
def test_create_get_delete_volume_with_volume_type_and_extra_specs(self):
@@ -88,7 +88,7 @@
self.assertEqual(vol_type_name, fetched_volume['volume_type'],
'The fetched Volume is different '
'from the created Volume')
- except:
+ except Exception:
self.fail("Could not create correct volume with volume_type")
finally:
if volume:
@@ -118,7 +118,7 @@
resp, fetched_volume_type = self.client.\
delete_volume_type(body['id'])
self.assertEqual(202, resp.status)
- except:
+ except Exception:
self.fail("Could not create a volume_type")
def test_volume_type_create_get(self):
@@ -148,7 +148,7 @@
self.assertEqual(extra_specs, fetched_volume_type['extra_specs'],
'The fetched Volume_type is different '
'from the created Volume_type')
- except:
+ except Exception:
self.fail("Could not create a volume_type")
finally:
if body:
diff --git a/tempest/tests/volume/admin/test_volume_types_extra_specs.py b/tempest/tests/volume/admin/test_volume_types_extra_specs.py
index 3f06c85..181c37c 100644
--- a/tempest/tests/volume/admin/test_volume_types_extra_specs.py
+++ b/tempest/tests/volume/admin/test_volume_types_extra_specs.py
@@ -16,8 +16,8 @@
# under the License.
from tempest.common.utils.data_utils import rand_name
-from tempest.tests.volume.base import BaseVolumeTest
from tempest.services.volume.json.admin import volume_types_client
+from tempest.tests.volume.base import BaseVolumeTest
class VolumeTypesExtraSpecsTest(BaseVolumeTest):
@@ -55,7 +55,7 @@
self.assertTrue(type(body), dict)
self.assertTrue('spec1' in body, "Incorrect volume type extra"
" spec returned")
- except:
+ except Exception:
self.fail("Could not list volume types extra specs")
def test_volume_type_extra_specs_update(self):
@@ -71,7 +71,7 @@
"Volume type extra spec incorrectly updated")
self.assertEqual(extra_spec['spec1'], body['spec1'],
"Volume type extra spec incorrectly updated")
- except:
+ except Exception:
self.fail("Couldnt update volume type extra spec")
def test_volume_type_extra_spec_create_delete(self):
@@ -87,7 +87,7 @@
delete_volume_type_extra_specs(self.volume_type['id'],
extra_specs.keys()[0])
self.assertEqual(202, resp.status)
- except:
+ except Exception:
self.fail("Could not create a volume_type extra spec")
def test_volume_type_extra_spec_create_get(self):
@@ -105,5 +105,5 @@
self.assertEqual(200, resp.status)
self.assertEqual(extra_specs, body,
"Volume type extra spec incorrectly fetched")
- except:
+ except Exception:
self.fail("Could not create a volume_type extra spec")