From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Wed, 17 Apr 2019 08:02:51 +0000 (+0300)
Subject: rgw/pubsub: fix "no module named rgw_multi.zone_ps"
X-Git-Tag: v15.1.0~2764^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfa501cfb77e72fe3e4cb2454aea99916705b812;p=ceph-ci.git

rgw/pubsub: fix "no module named rgw_multi.zone_ps"

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
---

diff --git a/src/test/rgw/rgw_multi/tests_ps.py b/src/test/rgw/rgw_multi/tests_ps.py
index 1e40a44baf8..b31df060f03 100644
--- a/src/test/rgw/rgw_multi/tests_ps.py
+++ b/src/test/rgw/rgw_multi/tests_ps.py
@@ -536,7 +536,6 @@ def test_ps_subscription():
 
 def test_ps_event_type_subscription():
     """ test subscriptions for different events """
-    return;
     zones, ps_zones = init_env()
     bucket_name = gen_bucket_name()
 
diff --git a/src/test/rgw/rgw_multi/zone_ps.py b/src/test/rgw/rgw_multi/zone_ps.py
index 006f4fc7bae..aa2f4ebda66 100644
--- a/src/test/rgw/rgw_multi/zone_ps.py
+++ b/src/test/rgw/rgw_multi/zone_ps.py
@@ -6,7 +6,7 @@ import hashlib
 import base64
 import xmltodict
 from time import gmtime, strftime
-from multisite import Zone
+from .multisite import Zone
 import boto3
 from botocore.client import Config