From 022fdb10ebf5e539fb4d84550d00943d55e5f746 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Wed, 26 Jul 2017 11:31:06 -0500 Subject: Skip object-store functional tests when Swift is not available Specifically, in the py3 jobs Swift is not (yet) properly starting as a py2 service, so we disabled swift in those OSC jobs and need to skip the object-store functional tests in that case. Change-Id: I073551c41b7636f04b3ee97dc6fe69630e207b67 --- openstackclient/tests/functional/object/v1/test_object.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'openstackclient/tests/functional/object/v1/test_object.py') diff --git a/openstackclient/tests/functional/object/v1/test_object.py b/openstackclient/tests/functional/object/v1/test_object.py index 0927d706..d1a73c54 100644 --- a/openstackclient/tests/functional/object/v1/test_object.py +++ b/openstackclient/tests/functional/object/v1/test_object.py @@ -14,18 +14,24 @@ import os import tempfile import uuid -from openstackclient.tests.functional import base +from openstackclient.tests.functional.object.v1 import common BASIC_LIST_HEADERS = ['Name'] CONTAINER_FIELDS = ['account', 'container', 'x-trans-id'] OBJECT_FIELDS = ['object', 'container', 'etag'] -class ObjectTests(base.TestCase): - """Functional tests for Object commands. """ +class ObjectTests(common.ObjectStoreTests): + """Functional tests for Object Store object commands""" CONTAINER_NAME = uuid.uuid4().hex + def setUp(self): + super(ObjectTests, self).setUp() + # Skip tests if no object-store is present + if not self.haz_object_store: + self.skipTest("No object-store service present") + def test_object(self): with tempfile.NamedTemporaryFile() as f: f.write('test content') -- cgit v1.2.1