convert docstrings to comments
Convert docstrings to comments so that it's easier
to track down what tests are running under nose
Change-Id: Ia59715eed72d1133efba575d08f0556022ea32b3
diff --git a/tempest/tests/volume/admin/test_volume_types.py b/tempest/tests/volume/admin/test_volume_types.py
index 224a927..8ebb78f 100644
--- a/tempest/tests/volume/admin/test_volume_types.py
+++ b/tempest/tests/volume/admin/test_volume_types.py
@@ -41,7 +41,7 @@
super(VolumeTypesTest, cls).tearDownClass()
def test_volume_type_list(self):
- """List Volume types."""
+ # List Volume types.
try:
resp, body = self.client.list_volume_types()
self.assertEqual(200, resp.status)
@@ -50,7 +50,7 @@
self.fail("Could not list volume types")
def test_create_get_delete_volume_with_volume_type_and_extra_specs(self):
- """ Create/get/delete volume with volume_type and extra spec. """
+ # Create/get/delete volume with volume_type and extra spec.
try:
volume = {}
vol_name = rand_name("volume-")
@@ -101,7 +101,7 @@
self.assertEqual(202, resp.status)
def test_volume_type_create_delete(self):
- """ Create/Delete volume type."""
+ # Create/Delete volume type.
try:
name = rand_name("volume-type-")
extra_specs = {"Spec1": "Val1", "Spec2": "Val2"}
@@ -122,7 +122,7 @@
self.fail("Could not create a volume_type")
def test_volume_type_create_get(self):
- """ Create/get volume type."""
+ # Create/get volume type.
try:
body = {}
name = rand_name("volume-type-")
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 181c37c..9734c42 100644
--- a/tempest/tests/volume/admin/test_volume_types_extra_specs.py
+++ b/tempest/tests/volume/admin/test_volume_types_extra_specs.py
@@ -47,7 +47,7 @@
cls.client.delete_volume_type(cls.volume_type['id'])
def test_volume_type_extra_specs_list(self):
- """List Volume types extra specs."""
+ # List Volume types extra specs.
try:
resp, body = self.client.\
list_volume_types_extra_specs(self.volume_type['id'])
@@ -59,7 +59,7 @@
self.fail("Could not list volume types extra specs")
def test_volume_type_extra_specs_update(self):
- """ Update volume type extra specs"""
+ # Update volume type extra specs
try:
extra_spec = {"spec1": "val2"}
resp, body = self.client.\
@@ -75,7 +75,7 @@
self.fail("Couldnt update volume type extra spec")
def test_volume_type_extra_spec_create_delete(self):
- """ Create/Delete volume type extra spec."""
+ # Create/Delete volume type extra spec.
try:
extra_specs = {"spec2": "val1"}
resp, body = self.client.\
@@ -91,7 +91,7 @@
self.fail("Could not create a volume_type extra spec")
def test_volume_type_extra_spec_create_get(self):
- """ Create/get volume type extra spec"""
+ # Create/get volume type extra spec
try:
extra_specs = {"spec1": "val1"}
resp, body = self.client.\
diff --git a/tempest/tests/volume/admin/test_volume_types_extra_specs_negative.py b/tempest/tests/volume/admin/test_volume_types_extra_specs_negative.py
index bfbfaae..d139425 100644
--- a/tempest/tests/volume/admin/test_volume_types_extra_specs_negative.py
+++ b/tempest/tests/volume/admin/test_volume_types_extra_specs_negative.py
@@ -46,7 +46,7 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_update_no_body(self):
- """ Should not update volume type extra specs with no body"""
+ # Should not update volume type extra specs with no body
extra_spec = {"spec1": "val2"}
self.client.update_volume_type_extra_specs(self.volume_type['id'],
extra_spec.keys()[0],
@@ -55,7 +55,7 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_update_nonexistent_extra_spec_id(self):
- """ Should not update volume type extra specs with nonexistent id."""
+ # Should not update volume type extra specs with nonexistent id.
extra_spec = {"spec1": "val2"}
self.client.update_volume_type_extra_specs(self.volume_type['id'],
str(uuid.uuid4()),
@@ -64,7 +64,7 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_update_none_extra_spec_id(self):
- """ Should not update volume type extra specs with none id."""
+ # Should not update volume type extra specs with none id.
extra_spec = {"spec1": "val2"}
self.client.update_volume_type_extra_specs(self.volume_type['id'],
None, extra_spec)
@@ -72,9 +72,8 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_update_multiple_extra_spec(self):
- """ Should not update volume type extra specs with multiple specs as
- body.
- """
+ # Should not update volume type extra specs with multiple specs as
+ # body.
extra_spec = {"spec1": "val2", 'spec2': 'val1'}
self.client.update_volume_type_extra_specs(self.volume_type['id'],
extra_spec.keys()[0],
@@ -83,9 +82,8 @@
@raises(exceptions.NotFound)
@attr(type='negative')
def test_create_nonexistent_type_id(self):
- """ Should not create volume type extra spec for nonexistent volume
- type id.
- """
+ # Should not create volume type extra spec for nonexistent volume
+ # type id.
extra_specs = {"spec2": "val1"}
self.client.create_volume_type_extra_specs(str(uuid.uuid4()),
extra_specs)
@@ -94,7 +92,7 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_create_none_body(self):
- """ Should not create volume type extra spec for none POST body."""
+ # Should not create volume type extra spec for none POST body.
self.client.create_volume_type_extra_specs(self.volume_type['id'],
None)
@@ -102,16 +100,15 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_create_invalid_body(self):
- """ Should not create volume type extra spec for invalid POST body."""
+ # Should not create volume type extra spec for invalid POST body.
self.client.create_volume_type_extra_specs(self.volume_type['id'],
['invalid'])
@raises(exceptions.NotFound)
@attr(type='negative')
def test_delete_nonexistent_volume_type_id(self):
- """ Should not delete volume type extra spec for nonexistent
- type id.
- """
+ # Should not delete volume type extra spec for nonexistent
+ # type id.
extra_specs = {"spec1": "val1"}
self.client.delete_volume_type_extra_specs(str(uuid.uuid4()),
extra_specs.keys()[0])
@@ -119,13 +116,13 @@
@raises(exceptions.NotFound)
@attr(type='negative')
def test_list_nonexistent_volume_type_id(self):
- """ Should not list volume type extra spec for nonexistent type id."""
+ # Should not list volume type extra spec for nonexistent type id.
self.client.list_volume_types_extra_specs(str(uuid.uuid4()))
@raises(exceptions.NotFound)
@attr(type='negative')
def test_get_nonexistent_volume_type_id(self):
- """ Should not get volume type extra spec for nonexistent type id."""
+ # Should not get volume type extra spec for nonexistent type id.
extra_specs = {"spec1": "val1"}
self.client.get_volume_type_extra_specs(str(uuid.uuid4()),
extra_specs.keys()[0])
@@ -133,9 +130,8 @@
@raises(exceptions.NotFound)
@attr(type='negative')
def test_get_nonexistent_extra_spec_id(self):
- """ Should not get volume type extra spec for nonexistent extra spec
- id.
- """
+ # Should not get volume type extra spec for nonexistent extra spec
+ # id.
self.client.get_volume_type_extra_specs(self.volume_type['id'],
str(uuid.uuid4()))
diff --git a/tempest/tests/volume/admin/test_volume_types_negative.py b/tempest/tests/volume/admin/test_volume_types_negative.py
index 91237fc..c2daef9 100644
--- a/tempest/tests/volume/admin/test_volume_types_negative.py
+++ b/tempest/tests/volume/admin/test_volume_types_negative.py
@@ -35,8 +35,7 @@
@raises(exceptions.NotFound)
@attr(type='negative')
def test_create_with_nonexistent_volume_type(self):
- """ Should not be able to create volume with nonexistent volume_type.
- """
+ # Should not be able to create volume with nonexistent volume_type.
self.volumes_client.create_volume(size=1,
display_name=str(uuid.uuid4()),
volume_type=str(uuid.uuid4()))
@@ -45,20 +44,19 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_create_with_empty_name(self):
- """ Should not be able to create volume type with an empty name."""
+ # Should not be able to create volume type with an empty name.
self.client.create_volume_type('')
@raises(exceptions.NotFound)
@attr(type='negative')
def test_get_nonexistent_type_id(self):
- """ Should not be able to get volume type with nonexistent type id."""
+ # Should not be able to get volume type with nonexistent type id.
self.client.get_volume_type(str(uuid.uuid4()))
@raises(exceptions.NotFound)
@attr(type='negative')
def test_delete_nonexistent_type_id(self):
- """ Should not be able to delete volume type with nonexistent type id.
- """
+ # Should not be able to delete volume type with nonexistent type id.
self.client.delete_volume_type(str(uuid.uuid4()))
diff --git a/tempest/tests/volume/test_volumes_actions.py b/tempest/tests/volume/test_volumes_actions.py
index 52c270c..7eddb67 100644
--- a/tempest/tests/volume/test_volumes_actions.py
+++ b/tempest/tests/volume/test_volumes_actions.py
@@ -50,7 +50,7 @@
@attr(type='smoke')
def test_attach_detach_volume_to_instance(self):
- """Volume is attached and detached successfully from an instance"""
+ # Volume is attached and detached successfully from an instance
try:
mountpoint = '/dev/vdc'
resp, body = self.client.attach_volume(self.volume['id'],
@@ -67,7 +67,7 @@
self.client.wait_for_volume_status(self.volume['id'], 'available')
def test_get_volume_attachment(self):
- """Verify that a volume's attachment information is retrieved"""
+ # Verify that a volume's attachment information is retrieved
mountpoint = '/dev/vdc'
resp, body = self.client.attach_volume(self.volume['id'],
self.server['id'],
diff --git a/tempest/tests/volume/test_volumes_get.py b/tempest/tests/volume/test_volumes_get.py
index 048c340..bc64ff4 100644
--- a/tempest/tests/volume/test_volumes_get.py
+++ b/tempest/tests/volume/test_volumes_get.py
@@ -25,7 +25,7 @@
@attr(type='smoke')
def test_volume_create_get_delete(self):
- """Create a volume, Get it's details and Delete the volume"""
+ # Create a volume, Get it's details and Delete the volume
try:
volume = {}
v_name = rand_name('Volume-')
@@ -69,7 +69,7 @@
@attr(type='positive')
def test_volume_get_metadata_none(self):
- """Create a volume without passing metadata, get details, and delete"""
+ # Create a volume without passing metadata, get details, and delete
try:
volume = {}
v_name = rand_name('Volume-')
diff --git a/tempest/tests/volume/test_volumes_list.py b/tempest/tests/volume/test_volumes_list.py
index b387b15..26a85b7 100644
--- a/tempest/tests/volume/test_volumes_list.py
+++ b/tempest/tests/volume/test_volumes_list.py
@@ -34,7 +34,7 @@
@attr(type='smoke')
def test_volume_list(self):
- """Get a list of Volumes"""
+ # Get a list of Volumes
# Fetch all volumes
resp, fetched_list = self.client.list_volumes()
self.assertEqual(200, resp.status)
@@ -47,7 +47,7 @@
@attr(type='smoke')
def test_volume_list_with_details(self):
- """Get a list of Volumes with details"""
+ # Get a list of Volumes with details
# Fetch all Volumes
resp, fetched_list = self.client.list_volumes_with_detail()
self.assertEqual(200, resp.status)
diff --git a/tempest/tests/volume/test_volumes_negative.py b/tempest/tests/volume/test_volumes_negative.py
index 2c8b006..6bd7002 100644
--- a/tempest/tests/volume/test_volumes_negative.py
+++ b/tempest/tests/volume/test_volumes_negative.py
@@ -28,7 +28,7 @@
@raises(exceptions.NotFound)
@attr(type='negative')
def test_volume_get_nonexistant_volume_id(self):
- """Should not be able to get a nonexistant volume"""
+ # Should not be able to get a nonexistant volume
#Creating a nonexistant volume id
volume_id_list = []
resp, volumes = self.client.list_volumes()
@@ -44,7 +44,7 @@
@raises(exceptions.NotFound)
@attr(type='negative')
def test_volume_delete_nonexistant_volume_id(self):
- """Should not be able to delete a nonexistant Volume"""
+ # Should not be able to delete a nonexistant Volume
# Creating nonexistant volume id
volume_id_list = []
resp, volumes = self.client.list_volumes()
@@ -60,10 +60,8 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_create_volume_with_invalid_size(self):
- """
- Should not be able to create volume with invalid size
- in request
- """
+ # Should not be able to create volume with invalid size
+ # in request
v_name = rand_name('Volume-')
metadata = {'Type': 'work'}
resp, volume = self.client.create_volume(size='#$%',
@@ -73,10 +71,8 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_create_volume_with_out_passing_size(self):
- """
- Should not be able to create volume without passing size
- in request
- """
+ # Should not be able to create volume without passing size
+ # in request
v_name = rand_name('Volume-')
metadata = {'Type': 'work'}
resp, volume = self.client.create_volume(size='',
@@ -86,9 +82,7 @@
@raises(exceptions.BadRequest)
@attr(type='negative')
def test_create_volume_with_size_zero(self):
- """
- Should not be able to create volume with size zero
- """
+ # Should not be able to create volume with size zero
v_name = rand_name('Volume-')
metadata = {'Type': 'work'}
resp, volume = self.client.create_volume(size='0',
@@ -98,33 +92,25 @@
@raises(exceptions.NotFound)
@attr(type='negative')
def test_get_invalid_volume_id(self):
- """
- Should not be able to get volume with invalid id
- """
+ # Should not be able to get volume with invalid id
resp, volume = self.client.get_volume('#$%%&^&^')
@raises(exceptions.NotFound)
@attr(type='negative')
def test_get_volume_without_passing_volume_id(self):
- """
- Should not be able to get volume when empty ID is passed
- """
+ # Should not be able to get volume when empty ID is passed
resp, volume = self.client.get_volume('')
@raises(exceptions.NotFound)
@attr(type='negative')
def test_delete_invalid_volume_id(self):
- """
- Should not be able to delete volume when invalid ID is passed
- """
+ # Should not be able to delete volume when invalid ID is passed
resp, volume = self.client.delete_volume('!@#$%^&*()')
@raises(exceptions.NotFound)
@attr(type='negative')
def test_delete_volume_without_passing_volume_id(self):
- """
- Should not be able to delete volume when empty ID is passed
- """
+ # Should not be able to delete volume when empty ID is passed
resp, volume = self.client.delete_volume('')