diff options
Diffstat (limited to 'src/software/test')
15 files changed, 18 insertions, 22 deletions
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 |