| commit | ba87053ccba73a8ffd9ee13af91ed5c564a4ad9e | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Jan 28 00:12:36 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Jan 28 00:12:36 2014 +0000 |
| tree | 44ab5107d0f0407c09e58cf216f822b41bcb5da0 | |
| parent | bd7b2ecc3ed249abae4c86d07c9f8fc82c827f6c [diff] | |
| parent | efe84bb4517fe366fb4b31858931e6d2a173374e [diff] |
Merge "Use unittest2.TestSuite with py26"
diff --git a/tempest/test_discover/test_discover.py b/tempest/test_discover/test_discover.py index 87fdbdc..3fbb8e1 100644 --- a/tempest/test_discover/test_discover.py +++ b/tempest/test_discover/test_discover.py
@@ -13,7 +13,12 @@ # under the License. import os -import unittest +import sys + +if sys.version_info >= (2, 7): + import unittest +else: + import unittest2 as unittest def load_tests(loader, tests, pattern):