qa/rgw/multisite: remove unused assert_raises() and tools.py

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

diff --git a/src/test/rgw/rgw_multi/tools.py b/src/test/rgw/rgw_multi/tools.py
deleted file mode 100644 (file)
index 87d10d1..0000000
--- a/src/test/rgw/rgw_multi/tools.py
+++ /dev/null
@@ -1,16 +0,0 @@
-def assert_raises(excClass, callableObj, *args, **kwargs):
-    """
-    Like unittest.TestCase.assertRaises, but returns the exception.
-    """
-    try:
-        callableObj(*args, **kwargs)
-    except excClass as e:
-        return e
-    else:
-        if hasattr(excClass, '__name__'):
-            excName = excClass.__name__
-        else:
-            excName = str(excClass)
-            raise AssertionError("%s not raised" % excName)
-
-

diff --git a/src/test/rgw/rgw_multi/zone_cloud.py b/src/test/rgw/rgw_multi/zone_cloud.py
index b7b5de1aeb69a01850d8671ee51e1ed6ceca65f2..ef9b4ba7bbbb952c42ea20e3c52249873603e17f 100644 (file)
--- a/src/test/rgw/rgw_multi/zone_cloud.py
+++ b/src/test/rgw/rgw_multi/zone_cloud.py
@@ -15,7 +15,6 @@ from itertools import zip_longest # type: ignore
 from urllib.parse import urlparse
 
 from .multisite import *
-from .tools import *
 
 log = logging.getLogger(__name__)