Use unittest2 on Python 2.6

19 files changed, 49 insertions, 25 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):
     """
diff --git a/src/software/test/README b/src/software/test/README
index f34a81c..3e2bd3b 100644
--- a/src/software/test/README
+++ b/src/software/test/README
@@ -24,6 +24,7 @@ There are number of environment variables, that affect test running:
 Dependencies
 ------------
  * @development-tools (rpmbuild, createrepo, yum-utils, etc.)
+ * unittest2 module must be installed on systems with Python < 2.7
 
 Preparation
 -----------
diff --git a/src/software/test/run.py b/src/software/test/run.py
index aff77f3..be2b1c7 100755
--- a/src/software/test/run.py
+++ b/src/software/test/run.py
@@ -35,7 +35,7 @@ import pywbem
 import os
 import sys
 import tempfile
-import unittest
+from lmi.test import unittest
 
 import reposetup
 import swbase
diff --git a/src/software/test/test_hosted_software_collection.py b/src/software/test/test_hosted_software_collection.py
index 4d53992..adbfeb6 100644
--- a/src/software/test/test_hosted_software_collection.py
+++ b/src/software/test/test_hosted_software_collection.py
@@ -23,7 +23,7 @@ Unit tests for ``LMI_MemberOfSoftwareCollection`` provider.
 """
 
 import pywbem
-import unittest
+from lmi.test import unittest
 
 import swbase
 
diff --git a/src/software/test/test_hosted_software_identity_resource.py b/src/software/test/test_hosted_software_identity_resource.py
index b9b0590..400a1e6 100644
--- a/src/software/test/test_hosted_software_identity_resource.py
+++ b/src/software/test/test_hosted_software_identity_resource.py
@@ -21,8 +21,7 @@
 """
 Unit tests for ``LMI_HostedSoftwareIdentityResource`` provider.
 """
-
-import unittest
+from lmi.test import unittest
 
 import swbase
 
diff --git a/src/software/test/test_installed_software_identity.py b/src/software/test/test_installed_software_identity.py
index f480f3c..fd0e616 100644
--- a/src/software/test/test_installed_software_identity.py
+++ b/src/software/test/test_installed_software_identity.py
@@ -24,11 +24,11 @@ Unit tests for ``LMI_InstalledSoftwareIdentity`` provider.
 """
 
 import pywbem
-import unittest
-
+from lmi.test import unittest
 from lmi.shell import LMIDeletedObjectError
 from lmi.test.lmibase import enable_lmi_exceptions
 from lmi.test.util import mark_tedious
+
 import package
 import swbase
 import util
diff --git a/src/software/test/test_member_of_software_collection.py b/src/software/test/test_member_of_software_collection.py
index 0b38f8e..1c4e75d 100644
--- a/src/software/test/test_member_of_software_collection.py
+++ b/src/software/test/test_member_of_software_collection.py
@@ -22,7 +22,7 @@
 Unit tests for ``LMI_MemberOfSoftwareCollection`` provider.
 """
 
-import unittest
+from lmi.test import unittest
 
 import swbase
 
diff --git a/src/software/test/test_resource_for_software_identity.py b/src/software/test/test_resource_for_software_identity.py
index acdf86d..e507284 100644
--- a/src/software/test/test_resource_for_software_identity.py
+++ b/src/software/test/test_resource_for_software_identity.py
@@ -21,8 +21,7 @@
 """
 Unit tests for ``LMI_ResourceForSoftwareIdentity`` provider.
 """
-
-import unittest
+from lmi.test import unittest
 
 import package
 import swbase
diff --git a/src/software/test/test_software_identity.py b/src/software/test/test_software_identity.py
index 8297bea..d0ab22c 100644
--- a/src/software/test/test_software_identity.py
+++ b/src/software/test/test_software_identity.py
@@ -24,8 +24,7 @@ Unit tests for ``LMI_SoftwareIdentity`` provider.
 
 from datetime import datetime, timedelta
 import pywbem
-import unittest
-
+from lmi.test import unittest
 from lmi.test.lmibase import enable_lmi_exceptions
 import package
 import swbase
diff --git a/src/software/test/test_software_identity_checks.py b/src/software/test/test_software_identity_checks.py
index 1ed01d5..e30af0d 100644
--- a/src/software/test/test_software_identity_checks.py
+++ b/src/software/test/test_software_identity_checks.py
@@ -25,9 +25,9 @@ Unit tests for ``LMI_SoftwareIdentityChecks`` provider.
 import os
 import pywbem
 import subprocess
-import unittest
-
+from lmi.test import unittest
 from lmi.test.lmibase import enable_lmi_exceptions
+
 import package
 import reposetup
 import swbase
diff --git a/src/software/test/test_software_identity_file_check.py b/src/software/test/test_software_identity_file_check.py
index 9b57b1f..be1452e 100644
--- a/src/software/test/test_software_identity_file_check.py
+++ b/src/software/test/test_software_identity_file_check.py
@@ -28,8 +28,7 @@ import pywbem
 import re
 import stat
 import subprocess
-import unittest
-
+from lmi.test import unittest
 from lmi.test.lmibase import enable_lmi_exceptions
 import package
 import swbase
diff --git a/src/software/test/test_software_identity_resource.py b/src/software/test/test_software_identity_resource.py
index 9901cd9..de4fc47 100644
--- a/src/software/test/test_software_identity_resource.py
+++ b/src/software/test/test_software_identity_resource.py
@@ -28,8 +28,7 @@ import pywbem
 import time
 import shutil
 import subprocess
-import unittest
-
+from lmi.test import unittest
 from lmi.test.lmibase import enable_lmi_exceptions
 import repository
 import swbase
diff --git a/src/software/test/test_software_installation_service.py b/src/software/test/test_software_installation_service.py
index e2351b0..9014f3d 100644
--- a/src/software/test/test_software_installation_service.py
+++ b/src/software/test/test_software_installation_service.py
@@ -25,9 +25,9 @@ Unit tests for ``LMI_SoftwareInstallationService`` provider.
 
 import pywbem
 import time
-import unittest
-
+from lmi.test import unittest
 from lmi.test.lmibase import enable_lmi_exceptions
+
 import package
 import swbase
 import util
diff --git a/src/software/test/test_software_installation_service_affects_element.py b/src/software/test/test_software_installation_service_affects_element.py
index 38abd8a..f80d0d6 100644
--- a/src/software/test/test_software_installation_service_affects_element.py
+++ b/src/software/test/test_software_installation_service_affects_element.py
@@ -22,7 +22,7 @@
 Unit tests for ``LMI_SoftwareInstallationServiceAffectsElement`` provider.
 """
 
-import unittest
+from lmi.test import unittest
 
 import swbase
 
diff --git a/src/software/test/test_software_provider.py b/src/software/test/test_software_provider.py
index 202ca48..36f1044 100644
--- a/src/software/test/test_software_provider.py
+++ b/src/software/test/test_software_provider.py
@@ -25,7 +25,7 @@ Miscellaneous unit tests for OpenLMI Software provider.
 
 import os
 import subprocess
-import unittest
+from lmi.test import unittest
 
 import swbase
 
diff --git a/src/software/test/test_system_software_collection.py b/src/software/test/test_system_software_collection.py
index da764d4..dfca7f0 100644
--- a/src/software/test/test_system_software_collection.py
+++ b/src/software/test/test_system_software_collection.py
@@ -22,7 +22,7 @@
 Unit tests for ``LMI_SystemSoftwareCollection`` provider.
 """
 
-import unittest
+from lmi.test import unittest
 
 import swbase