From: Casey Bodley Date: Wed, 25 Mar 2020 20:19:15 +0000 (-0400) Subject: qa/rgw: partial revert of 'import with full path' X-Git-Tag: v15.2.4~42^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e2efab8606180c8aa82b438912254a78af1e61d;p=ceph.git qa/rgw: partial revert of 'import with full path' Signed-off-by: Casey Bodley (cherry picked from commit aa60edcec89b1538070b316c496e55bd0e15f966) --- diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index aa7d4d6571f0..a79c42909b16 100644 --- a/src/test/rgw/rgw_multi/multisite.py +++ b/src/test/rgw/rgw_multi/multisite.py @@ -3,7 +3,7 @@ from six import StringIO import json -from tasks.rgw_multi.conn import get_gateway_connection, get_gateway_secure_connection +from .conn import get_gateway_connection, get_gateway_secure_connection class Cluster: """ interface to run commands against a distinct ceph cluster """ diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index e96dd7ffee50..018aa4bd4ec4 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -23,10 +23,10 @@ from nose.tools import eq_ as eq from nose.plugins.attrib import attr from nose.plugins.skip import SkipTest -from tasks.rgw_multi.multisite import Zone, ZoneGroup, Credentials +from .multisite import Zone, ZoneGroup, Credentials -from tasks.rgw_multi.conn import get_gateway_connection -from tasks.rgw_multi.tools import assert_raises +from .conn import get_gateway_connection +from .tools import assert_raises class Config: """ test configuration """ diff --git a/src/test/rgw/rgw_multi/tests_az.py b/src/test/rgw/rgw_multi/tests_az.py index 67fc1728229e..13ec832a2041 100644 --- a/src/test/rgw/rgw_multi/tests_az.py +++ b/src/test/rgw/rgw_multi/tests_az.py @@ -5,7 +5,7 @@ from nose.tools import assert_not_equal, assert_equal from boto.s3.deletemarker import DeleteMarker -from tasks.rgw_multi.tests import get_realm, \ +from .tests import get_realm, \ ZonegroupConns, \ zonegroup_meta_checkpoint, \ zone_meta_checkpoint, \ @@ -17,7 +17,7 @@ from tasks.rgw_multi.tests import get_realm, \ get_user, \ get_tenant -from tasks.rgw_multi.zone_az import print_connection_info +from .zone_az import print_connection_info # configure logging for the tests module diff --git a/src/test/rgw/rgw_multi/tests_es.py b/src/test/rgw/rgw_multi/tests_es.py index 760ef455ffc8..1854c4cfedb0 100644 --- a/src/test/rgw/rgw_multi/tests_es.py +++ b/src/test/rgw/rgw_multi/tests_es.py @@ -10,9 +10,9 @@ import dateutil from nose.tools import eq_ as eq from six.moves import range -from tasks.rgw_multi.multisite import * -from tasks.rgw_multi.tests import * -from tasks.rgw_multi.zone_es import * +from .multisite import * +from .tests import * +from .zone_es import * log = logging.getLogger(__name__) diff --git a/src/test/rgw/rgw_multi/tests_ps.py b/src/test/rgw/rgw_multi/tests_ps.py index 7588b5f872b8..9f2dc27ce1e4 100644 --- a/src/test/rgw/rgw_multi/tests_ps.py +++ b/src/test/rgw/rgw_multi/tests_ps.py @@ -9,7 +9,7 @@ import socket import time import os from random import randint -from tasks.rgw_multi.tests import get_realm, \ +from .tests import get_realm, \ ZonegroupConns, \ zonegroup_meta_checkpoint, \ zone_meta_checkpoint, \ @@ -20,7 +20,7 @@ from tasks.rgw_multi.tests import get_realm, \ gen_bucket_name, \ get_user, \ get_tenant -from tasks.rgw_multi.zone_ps import PSTopic, \ +from .zone_ps import PSTopic, \ PSTopicS3, \ PSNotification, \ PSSubscription, \ @@ -30,7 +30,7 @@ from tasks.rgw_multi.zone_ps import PSTopic, \ put_object_tagging, \ get_object_tagging, \ delete_all_objects -from tasks.rgw_multi.multisite import User +from .multisite import User from nose import SkipTest from nose.tools import assert_not_equal, assert_equal import boto.s3.tagging diff --git a/src/test/rgw/rgw_multi/zone_az.py b/src/test/rgw/rgw_multi/zone_az.py index a34fd9b7067a..aaab3ef74cf5 100644 --- a/src/test/rgw/rgw_multi/zone_az.py +++ b/src/test/rgw/rgw_multi/zone_az.py @@ -1,6 +1,6 @@ import logging -from tasks.rgw_multi.multisite import Zone +from .multisite import Zone log = logging.getLogger('rgw_multi.tests') diff --git a/src/test/rgw/rgw_multi/zone_cloud.py b/src/test/rgw/rgw_multi/zone_cloud.py index 324022bb2919..eb945a44bc21 100644 --- a/src/test/rgw/rgw_multi/zone_cloud.py +++ b/src/test/rgw/rgw_multi/zone_cloud.py @@ -18,8 +18,8 @@ except ImportError: from six.moves.urllib.parse import urlparse -from tasks.rgw_multi.multisite import * -from tasks.rgw_multi.tools import * +from .multisite import * +from .tools import * log = logging.getLogger(__name__) diff --git a/src/test/rgw/rgw_multi/zone_es.py b/src/test/rgw/rgw_multi/zone_es.py index 96aa297da7b1..7ba31a430789 100644 --- a/src/test/rgw/rgw_multi/zone_es.py +++ b/src/test/rgw/rgw_multi/zone_es.py @@ -13,8 +13,8 @@ try: except ImportError: from itertools import zip_longest -from tasks.rgw_multi.multisite import * -from tasks.rgw_multi.tools import * +from .multisite import * +from .tools import * log = logging.getLogger(__name__) diff --git a/src/test/rgw/rgw_multi/zone_ps.py b/src/test/rgw/rgw_multi/zone_ps.py index f6b60439a7a0..84413f5565d8 100644 --- a/src/test/rgw/rgw_multi/zone_ps.py +++ b/src/test/rgw/rgw_multi/zone_ps.py @@ -8,7 +8,7 @@ import xmltodict from six.moves import http_client from six.moves.urllib import parse as urlparse from time import gmtime, strftime -from tasks.rgw_multi.multisite import Zone +from .multisite import Zone import boto3 from botocore.client import Config diff --git a/src/test/rgw/rgw_multi/zone_rados.py b/src/test/rgw/rgw_multi/zone_rados.py index e73d8f4e95e3..3b298e8b42f7 100644 --- a/src/test/rgw/rgw_multi/zone_rados.py +++ b/src/test/rgw/rgw_multi/zone_rados.py @@ -8,7 +8,7 @@ except ImportError: from nose.tools import eq_ as eq -from tasks.rgw_multi.multisite import * +from .multisite import * log = logging.getLogger(__name__)