Use unittest2 on Python 2.6

4 files changed, 31 insertions, 3 deletions

diff --git a/src/python/lmi/test/base.py b/src/python/lmi/test/base.py
index aca73ee..4707c78 100644
--- a/src/python/lmi/test/base.py
+++ b/src/python/lmi/test/base.py
@@ -25,8 +25,8 @@ Base classes for *OpenLMI Provider* test cases.
 import os
 import pywbem
 import socket
-import unittest
 
+from lmi.test import unittest
 from lmi.test import util
 
 def render_iname(iname, indent=2):
diff --git a/src/python/lmi/test/cases/test_lmi_instances.py b/src/python/lmi/test/cases/test_lmi_instances.py
index 7af28f7..77a50d7 100644
--- a/src/python/lmi/test/cases/test_lmi_instances.py
+++ b/src/python/lmi/test/cases/test_lmi_instances.py
@@ -21,7 +21,7 @@
 
 from lmi.test.lmibase import LmiTestCase
 import lmi.shell
-import unittest
+from lmi.test import unittest
 import pywbem
 import traceback
 import sys
diff --git a/src/python/lmi/test/unittest.py b/src/python/lmi/test/unittest.py
new file mode 100644
index 0000000..66492b8
--- /dev/null
+++ b/src/python/lmi/test/unittest.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2014 Red Hat, Inc.  All rights reserved.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# Authors: Jan Safranke <jsafrane@redhat.com>
+#
+"""
+This is a dummy module, which serves either as 'unittest' on Python >= 2.7
+or 'unittest2' on Python <= 2.6
+"""
+
+import sys
+if sys.version_info[0] > 2 or sys.version_info[1] > 6:
+    from unittest import *
+else:
+    from unittest2 import *
diff --git a/src/python/lmi/test/util.py b/src/python/lmi/test/util.py
index 40459ff..241e16a 100644
--- a/src/python/lmi/test/util.py
+++ b/src/python/lmi/test/util.py
@@ -23,7 +23,7 @@ LMI test utilities.
 import os
 import pywbem
 import socket
-import unittest
+from lmi.test import unittest
 
 def is_this_system(system_name):
     """