Merge "Object write/read ACL and few security testcases"
diff --git a/tempest/tests/compute/images/test_images_oneserver.py b/tempest/tests/compute/images/test_images_oneserver.py
index 2841a21..f8b560b 100644
--- a/tempest/tests/compute/images/test_images_oneserver.py
+++ b/tempest/tests/compute/images/test_images_oneserver.py
@@ -82,6 +82,8 @@
self.fail("Should raise 413 Over Limit if meta data was too long")
@attr(type='negative')
+ @unittest.skipUnless(compute.MULTI_USER,
+ 'Need multiple users for this test.')
def test_delete_image_of_another_tenant(self):
# Return an error while trying to delete another tenant's image
self.servers_client.wait_for_server_status(self.server['id'], 'ACTIVE')
@@ -121,6 +123,8 @@
self.assertEqual(original_image['minDisk'], image['minDisk'])
@attr(type='negative')
+ @unittest.skipUnless(compute.MULTI_USER,
+ 'Need multiple users for this test.')
def test_create_image_for_server_in_another_tenant(self):
# Creating image of another tenant's server should be return error
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 42ed32c..f4621c9 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -95,9 +95,9 @@
class Fedora(Distro):
- """This covers all Fedora-based distributions.
+ """This covers Fedora-based distributions.
- Includes: Fedora, RHEL, CentOS, Scientific Linux"""
+ Includes: Fedora, RHEL, Scientific Linux"""
def check_pkg(self, pkg):
return run_command_with_code(['rpm', '-q', pkg],
@@ -141,10 +141,23 @@
'contrib/redhat-eventlet.patch')
+class CentOS(Fedora):
+ """This covers CentOS."""
+
+ def post_process(self):
+ if not self.check_pkg('openssl-devel'):
+ self.yum.install('openssl-devel', check_exit_code=False)
+
+
def get_distro():
if (os.path.exists('/etc/fedora-release') or
- os.path.exists('/etc/redhat-release')):
- return Fedora()
+ os.path.exists('/etc/redhat-release')):
+ if os.path.exists('/etc/redhat-release') \
+ and run_command_with_code(['grep', 'CentOS',
+ '/etc/redhat-release']) == 0:
+ return CentOS()
+ else:
+ return Fedora()
else:
return Distro()
diff --git a/tools/test-requires b/tools/test-requires
index fa98918..d3c7a1e 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,5 +1,4 @@
pep8==1.3.3
pylint==0.19
# Needed for whitebox testing
-paramiko
sqlalchemy