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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit aa60edcec89b1538070b316c496e55bd0e15f966)

diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py
index aa7d4d6571f04f07df14d320a31697a5502cadfd..a79c42909b16f7fabfed0e3242fecc9c8f0feb7a 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 e96dd7ffee502d26585794fd1c8ff88c88e6090f..018aa4bd4ec48b6c4e33948b2bf069af7f085e61 100644 (file)
--- 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 67fc1728229efe53abd367af24efb56759ea1f72..13ec832a2041ca2d8486d8bae7736bf735d164ab 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 760ef455ffc853e719b26deb5b36df7ebfb94e9c..1854c4cfedb02ac45bd303d9df4ffa04df7201e9 100644 (file)
--- 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 7588b5f872b81e405af127e6671e7e6aa9e175df..9f2dc27ce1e4db3c76943d7f6c486e08c1cdd605 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 324022bb29199ce9645a8af591d560797fa8de93..eb945a44bc21d248430a50d38b2313fb0cc20c1f 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 96aa297da7b13ae109e55e5a68d7a21d928ab976..7ba31a43078982523b384bfe87d21e6e48a0190f 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 f6b60439a7a04ca0710387645ab0e99c3ed13a91..84413f5565d8ff6211c1e2784936f8ad58080877 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__)