From 93ec6c96b04387f48433fcf3edc8058e1e79efcc Mon Sep 17 00:00:00 2001 From: Radek Novacek Date: Mon, 19 May 2014 12:07:28 +0200 Subject: Test: get rid of 'import unittest' Always use 'from lmi.test import unittest' instead of plain 'import unittest', because it automagically imports unittest2 on python 2.6. --- src/hardware/test/TestHardware.py | 1 - src/hardware/test/TestHardwareBase.py | 1 - src/journald/test/TestIndications.py | 2 +- src/journald/test/TestIterators.py | 2 +- src/journald/test/TestWriting.py | 2 +- src/python/lmi/base/singletonmixin.py | 2 +- src/service-dbus/test/testService.py | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/hardware/test/TestHardware.py b/src/hardware/test/TestHardware.py index 949b6a3..c1fdda7 100644 --- a/src/hardware/test/TestHardware.py +++ b/src/hardware/test/TestHardware.py @@ -20,7 +20,6 @@ from TestHardwareBase import * from lmi.shell import LMIInstance import os -import unittest class TestHardwareProcessor(HardwareProcessorTestCase): """ diff --git a/src/hardware/test/TestHardwareBase.py b/src/hardware/test/TestHardwareBase.py index bea2224..310210c 100644 --- a/src/hardware/test/TestHardwareBase.py +++ b/src/hardware/test/TestHardwareBase.py @@ -27,7 +27,6 @@ import os import re import subprocess from hwdata import PCI -import unittest from pprint import pprint def parse_whole_dmi_line(line): diff --git a/src/journald/test/TestIndications.py b/src/journald/test/TestIndications.py index 0a1acf7..4b96ba1 100644 --- a/src/journald/test/TestIndications.py +++ b/src/journald/test/TestIndications.py @@ -21,7 +21,7 @@ from journald_common import JournalBase import os import time import syslog -import unittest +from lmi.test import unittest import pywbem class TestIndications(JournalBase): diff --git a/src/journald/test/TestIterators.py b/src/journald/test/TestIterators.py index 4a79b57..7f305d6 100644 --- a/src/journald/test/TestIterators.py +++ b/src/journald/test/TestIterators.py @@ -20,7 +20,7 @@ from journald_common import JournalBase from lmi.shell import LMIInstance import pywbem -import unittest +from lmi.test import unittest CIM_MESSAGELOG_ITERATOR_RESULT_SUCCESS = 0 CIM_MESSAGELOG_ITERATOR_RESULT_NOT_SUPPORTED = 1 diff --git a/src/journald/test/TestWriting.py b/src/journald/test/TestWriting.py index 7f53a3c..6afa397 100644 --- a/src/journald/test/TestWriting.py +++ b/src/journald/test/TestWriting.py @@ -19,7 +19,7 @@ from journald_common import JournalBase from lmi.shell import LMIInstance -import unittest +from lmi.test import unittest import time diff --git a/src/python/lmi/base/singletonmixin.py b/src/python/lmi/base/singletonmixin.py index c252676..659ea22 100644 --- a/src/python/lmi/base/singletonmixin.py +++ b/src/python/lmi/base/singletonmixin.py @@ -272,7 +272,7 @@ class Singleton(object): if __name__ == '__main__': - import unittest + from lmi.test import unittest import time class SingletonMixinPublicTestCase(unittest.TestCase): diff --git a/src/service-dbus/test/testService.py b/src/service-dbus/test/testService.py index 1c0efec..e258a4a 100644 --- a/src/service-dbus/test/testService.py +++ b/src/service-dbus/test/testService.py @@ -18,7 +18,7 @@ # Authors: Robin Hack ; Jan Grec ; Jan Safranek # -import unittest +from lmi.test import unittest import subprocess from lmi.test import lmibase -- cgit