qa/rgw: partial revert of 'import with full path'

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py
index 464c4d26ef9039a599c2096da3950050992415d4..a0a53fe4d5f0eebdf8eccacb36e2d3cb6ba8c5b0 100644 (file)
--- 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 e0c943063e14257f63a03fa2e97be7d675f145d5..598356dff0e12ea06efa5a50aa110a5dbb152cc2 100644 (file)
--- 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_az.py b/src/test/rgw/rgw_multi/tests_az.py
index 77b23b917271accc5e4ec3e39ec3d0a88a98994e..1a1434ae26ce9c1478dc5eac0a4cd966528447ab 100644 (file)
--- 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 6100b1e312d4857228b17e3f1a271e3338a4fda1..e6c0bb3a1062fd5603ce3d6cc365f59a8fe65ded 100644 (file)
--- 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 1e75a5e457f45f48f3159c15f78a6b371de4a9d0..e4b218e1a1e878f850817db4083c73edb24f65e0 100644 (file)
--- 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 a34fd9b7067a5a470e2b87b2edf843105e0738b4..aaab3ef74cf579db104f853f3983b95e2cee23f2 100644 (file)
--- 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 51267cd25c94b7f4299b367f0812f05651310fb2..83bfae19e6c1cf1c9fbc6389f25b1738a0ad0824 100644 (file)
--- 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 c24048fbc089597e9bedd65d3127a74204384bf9..1f85744a49cec8f196f6b77b54b80438bdb6b03f 100644 (file)
--- 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 b7af724c3de4447a8c741ee05ffcca17b121c4f6..225b47c6963cbfc351ec0002cf7c674b2846307d 100644 (file)
--- 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 e73d8f4e95e3da5e4ed338602ab66d0c82c7be8c..3b298e8b42f78c2f55d71dbf44a58afd83d04c53 100644 (file)
--- 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__)