Merge "only install things in the venv for pep8"
diff --git a/tempest/tests/boto/test_ec2_instance_run.py b/tempest/tests/boto/test_ec2_instance_run.py
index 08dc330..b6b93d8 100644
--- a/tempest/tests/boto/test_ec2_instance_run.py
+++ b/tempest/tests/boto/test_ec2_instance_run.py
@@ -202,14 +202,13 @@
re_search_wait(_output, text)
part_lines = ssh.get_partitions().split('\n')
- # "attaching" invalid EC2 state ! #1074901
volume.attach(instance.id, "/dev/vdh")
def _volume_state():
volume.update(validate=True)
return volume.status
- #self.assertVolumeStatusWait(_volume_state, "in-use") # #1074901
+ self.assertVolumeStatusWait(_volume_state, "in-use")
re_search_wait(_volume_state, "in-use")
#NOTE(afazekas): Different Hypervisor backends names
@@ -229,9 +228,9 @@
#TODO(afazekas): Resource compare to the flavor settings
- volume.detach() # "detaching" invalid EC2 status #1074901
+ volume.detach()
- #self.assertVolumeStatusWait(_volume_state, "available")
+ self.assertVolumeStatusWait(_volume_state, "available")
re_search_wait(_volume_state, "available")
LOG.info("Volume %s state: %s", volume.id, volume.status)
diff --git a/tempest/tests/boto/test_ec2_volumes.py b/tempest/tests/boto/test_ec2_volumes.py
index dc8ff31..37a913e 100644
--- a/tempest/tests/boto/test_ec2_volumes.py
+++ b/tempest/tests/boto/test_ec2_volumes.py
@@ -39,7 +39,6 @@
cls.client = cls.os.ec2api_client
cls.zone = cls.client.get_good_zone()
-#NOTE(afazekas): as admin it can trigger the Bug #1074901
@attr(type='smoke')
def test_create_get_delete(self):
# EC2 Create, get, delete Volume