commit 66b9ec5bc978f018d326f2f91188908e4983079a
author Jenkins <jenkins@review.openstack.org> Wed May 13 16:30:01 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 13 16:30:01 2015 +0000
tree 2d9c3b216af7b63fc85ad3b4e23ef1aaf0c51f97
parent 3d4985a434145e4e17c7a9694462bdc7831746ac
parent 843227d34a2c390831c2b53059a8158ce89e1d3c

Merge "Fix raise syntax in test.py for python3 compat"

tempest/test.py

diff --git a/tempest/test.py b/tempest/test.py
index 737d997..d80e478 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -267,7 +267,7 @@
                      etype, cls.__name__))
             cls.tearDownClass()
             try:
-                raise etype, value, trace
+                six.reraise(etype, value, trace)
             finally:
                 del trace  # to avoid circular refs
 
@@ -305,7 +305,7 @@
         # the first one
         if re_raise and etype is not None:
             try:
-                raise etype, value, trace
+                six.reraise(etype, value, trace)
             finally:
                 del trace  # to avoid circular refs
 

tempest/thirdparty/boto/test.py

diff --git a/tempest/thirdparty/boto/test.py b/tempest/thirdparty/boto/test.py
index 4485972..1ff4dee 100644
--- a/tempest/thirdparty/boto/test.py
+++ b/tempest/thirdparty/boto/test.py
@@ -252,9 +252,9 @@
         except exception.BotoServerError as exc:
             error_msg = excMatcher.match(exc)
             if error_msg is not None:
-                raise self.failureException, error_msg
+                raise self.failureException(error_msg)
         else:
-            raise self.failureException, "BotoServerError not raised"
+            raise self.failureException("BotoServerError not raised")
 
     @classmethod
     def resource_cleanup(cls):