From f297b1e17b0d6a6ed36cb01bb70902af35d63412 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 25 Mar 2020 16:19:15 -0400 Subject: [PATCH] qa/rgw: partial revert of 'import with full path' Signed-off-by: Casey Bodley (cherry picked from commit aa60edcec89b1538070b316c496e55bd0e15f966) Conflicts: src/test/rgw/rgw_multi/tests_az.py src/test/rgw/rgw_multi/tests_ps.py src/test/rgw/rgw_multi/zone_az.py: trivial resolution --- src/test/rgw/rgw_multi/multisite.py | 2 +- src/test/rgw/rgw_multi/tests.py | 6 +++--- src/test/rgw/rgw_multi/tests_es.py | 6 +++--- src/test/rgw/rgw_multi/tests_ps.py | 6 +++--- src/test/rgw/rgw_multi/zone_cloud.py | 4 ++-- src/test/rgw/rgw_multi/zone_es.py | 4 ++-- src/test/rgw/rgw_multi/zone_ps.py | 2 +- src/test/rgw/rgw_multi/zone_rados.py | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index dcd24b2ef969a..f189a50783971 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 a089f537927e9..31b8233c0316c 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -22,10 +22,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_es.py b/src/test/rgw/rgw_multi/tests_es.py index 6100b1e312d48..e6c0bb3a1062f 100644 --- a/src/test/rgw/rgw_multi/tests_es.py +++ b/src/test/rgw/rgw_multi/tests_es.py @@ -9,9 +9,9 @@ import dateutil from nose.tools import eq_ as eq -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 b93583d6e1a17..3461bc07a75ba 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, \ @@ -31,7 +31,7 @@ from tasks.rgw_multi.zone_ps import PSTopic, \ get_object_tagging, \ delete_all_objects, \ delete_all_s3_topics -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_cloud.py b/src/test/rgw/rgw_multi/zone_cloud.py index 4e293fda91496..4e5eefb8c11b5 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 779fa046f2a3f..55edae7292017 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 ed4522e569b5b..0d4bb37ea7c88 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 b28a466e558c1..e645e9abe89fa 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__) -- 2.39.5