commit a5229b6d3bce0a34168a94aaf8a8bea2fce33159
author Jenkins <jenkins@review.openstack.org> Thu Feb 13 01:19:33 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Feb 13 01:19:33 2014 +0000
tree ada0547ae0a920a149a86c5f60a52e3667899b0a
parent f8870ec8f3db43439553867149ec6338f3edc7eb
parent 5394332f50dec8d15de007d5c0d1643b9899ec4c

Merge "Define py27 assertFoo methods for py26"

tempest/test.py

diff --git a/tempest/test.py b/tempest/test.py
index 8485a48..dcba226 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -17,6 +17,7 @@
 import functools
 import json
 import os
+import sys
 import time
 import urllib
 import uuid
@@ -241,10 +242,23 @@
 
 atexit.register(validate_tearDownClass)
 
-
-class BaseTestCase(testtools.TestCase,
+if sys.version_info >= (2, 7):
+    class BaseDeps(testtools.TestCase,
                    testtools.testcase.WithAttributes,
                    testresources.ResourcedTestCase):
+        pass
+else:
+    # Define asserts for py26
+    import unittest2
+
+    class BaseDeps(testtools.TestCase,
+                   testtools.testcase.WithAttributes,
+                   testresources.ResourcedTestCase,
+                   unittest2.TestCase):
+        pass
+
+
+class BaseTestCase(BaseDeps):
 
     setUpClassCalled = False
     _service = None