[rhel6-branch 10/30] Import unittest2 as unittest everywhere.

mulkieran installerbot-noreply at redhat.com
Thu May 28 21:04:15 UTC 2015


From: Anne Mulhern <amulhern at redhat.com>

Signed-off-by: Anne Mulhern <amulhern at redhat.com>
---
 tests/action_test.py                             | 2 +-
 tests/clearpart_test.py                          | 2 +-
 tests/devicefactory_test.py                      | 2 +-
 tests/devicelibs_test/btrfs_test.py              | 2 +-
 tests/devicelibs_test/crypto_test.py             | 2 +-
 tests/devicelibs_test/dasd_test.py               | 2 +-
 tests/devicelibs_test/edd_test.py                | 2 +-
 tests/devicelibs_test/lvm_test.py                | 2 +-
 tests/devicelibs_test/mdraid_interrogate_test.py | 2 +-
 tests/devicelibs_test/mdraid_test.py             | 2 +-
 tests/devicelibs_test/raid_test.py               | 2 +-
 tests/devicelibs_test/swap_test.py               | 2 +-
 tests/devices_test.py                            | 2 +-
 tests/devicetree_test.py                         | 2 +-
 tests/formats_test/device_test.py                | 2 +-
 tests/formats_test/fs_test.py                    | 2 +-
 tests/formats_test/init_test.py                  | 2 +-
 tests/formats_test/labeling_test.py              | 2 +-
 tests/formats_test/selinux_test.py               | 2 +-
 tests/imagebackedtestcase.py                     | 2 +-
 tests/loopbackedtestcase.py                      | 2 +-
 tests/parentlist_test.py                         | 2 +-
 tests/partitioning_test.py                       | 2 +-
 tests/size_test.py                               | 2 +-
 tests/storagetestcase.py                         | 2 +-
 tests/tsort_test.py                              | 2 +-
 tests/udev_test.py                               | 2 +-
 tests/util_test.py                               | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/tests/action_test.py b/tests/action_test.py
index 6440832..1a60a3a 100644
--- a/tests/action_test.py
+++ b/tests/action_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import unittest
+import unittest2 as unittest
 
 from tests.storagetestcase import StorageTestCase
 import blivet
diff --git a/tests/clearpart_test.py b/tests/clearpart_test.py
index 80d43ee..32aa226 100644
--- a/tests/clearpart_test.py
+++ b/tests/clearpart_test.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import mock
 
 import blivet
diff --git a/tests/devicefactory_test.py b/tests/devicefactory_test.py
index 8ea43cb..85450dd 100644
--- a/tests/devicefactory_test.py
+++ b/tests/devicefactory_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import unittest
+import unittest2 as unittest
 
 import blivet
 
diff --git a/tests/devicelibs_test/btrfs_test.py b/tests/devicelibs_test/btrfs_test.py
index e3f658e..3f6c867 100755
--- a/tests/devicelibs_test/btrfs_test.py
+++ b/tests/devicelibs_test/btrfs_test.py
@@ -3,7 +3,7 @@
 import os.path
 import subprocess
 import tempfile
-import unittest
+import unittest2 as unittest
 
 import blivet.devicelibs.btrfs as btrfs
 from blivet.errors import BTRFSError
diff --git a/tests/devicelibs_test/crypto_test.py b/tests/devicelibs_test/crypto_test.py
index cd7de7a..fd1ac8f 100755
--- a/tests/devicelibs_test/crypto_test.py
+++ b/tests/devicelibs_test/crypto_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 
 import tempfile
 import os
diff --git a/tests/devicelibs_test/dasd_test.py b/tests/devicelibs_test/dasd_test.py
index 98f2cd1..0fdccfa 100644
--- a/tests/devicelibs_test/dasd_test.py
+++ b/tests/devicelibs_test/dasd_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 
 import blivet.devicelibs.dasd as dasd
 
diff --git a/tests/devicelibs_test/edd_test.py b/tests/devicelibs_test/edd_test.py
index d7d729c..9cc7d94 100644
--- a/tests/devicelibs_test/edd_test.py
+++ b/tests/devicelibs_test/edd_test.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import mock
 
 class EddTestCase(unittest.TestCase):
diff --git a/tests/devicelibs_test/lvm_test.py b/tests/devicelibs_test/lvm_test.py
index d88c451..afde815 100755
--- a/tests/devicelibs_test/lvm_test.py
+++ b/tests/devicelibs_test/lvm_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 import glob
 
 import blivet.devicelibs.lvm as lvm
diff --git a/tests/devicelibs_test/mdraid_interrogate_test.py b/tests/devicelibs_test/mdraid_interrogate_test.py
index cee2421..1c2fd97 100755
--- a/tests/devicelibs_test/mdraid_interrogate_test.py
+++ b/tests/devicelibs_test/mdraid_interrogate_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 import time
 import uuid
 
diff --git a/tests/devicelibs_test/mdraid_test.py b/tests/devicelibs_test/mdraid_test.py
index 4cd50a3..22a9205 100755
--- a/tests/devicelibs_test/mdraid_test.py
+++ b/tests/devicelibs_test/mdraid_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 import time
 
 import blivet.devicelibs.raid as raid
diff --git a/tests/devicelibs_test/raid_test.py b/tests/devicelibs_test/raid_test.py
index ba1a580..b08de8c 100644
--- a/tests/devicelibs_test/raid_test.py
+++ b/tests/devicelibs_test/raid_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 
 import blivet.devicelibs.raid as raid
 import blivet.errors as errors
diff --git a/tests/devicelibs_test/swap_test.py b/tests/devicelibs_test/swap_test.py
index 1b8e1aa..6af1dea 100755
--- a/tests/devicelibs_test/swap_test.py
+++ b/tests/devicelibs_test/swap_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 
 import blivet.devicelibs.swap as swap
 from blivet.errors import SwapError
diff --git a/tests/devices_test.py b/tests/devices_test.py
index c526c74..96516eb 100644
--- a/tests/devices_test.py
+++ b/tests/devices_test.py
@@ -2,7 +2,7 @@
 # vim:set fileencoding=utf-8
 
 import os
-import unittest
+import unittest2 as unittest
 
 from mock import Mock
 
diff --git a/tests/devicetree_test.py b/tests/devicetree_test.py
index 906fe7a..11c60e8 100644
--- a/tests/devicetree_test.py
+++ b/tests/devicetree_test.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 from tests.imagebackedtestcase import ImageBackedTestCase
 
diff --git a/tests/formats_test/device_test.py b/tests/formats_test/device_test.py
index 588cb97..9dd164f 100755
--- a/tests/formats_test/device_test.py
+++ b/tests/formats_test/device_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 
 import blivet
 
diff --git a/tests/formats_test/fs_test.py b/tests/formats_test/fs_test.py
index 69859ba..5c32a81 100755
--- a/tests/formats_test/fs_test.py
+++ b/tests/formats_test/fs_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import os
 import tempfile
-import unittest
+import unittest2 as unittest
 
 import blivet.formats.fs as fs
 from blivet.size import Size, ROUND_DOWN
diff --git a/tests/formats_test/init_test.py b/tests/formats_test/init_test.py
index 6fc11c6..8381dc6 100644
--- a/tests/formats_test/init_test.py
+++ b/tests/formats_test/init_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import copy
-import unittest
+import unittest2 as unittest
 
 import blivet.formats as formats
 
diff --git a/tests/formats_test/labeling_test.py b/tests/formats_test/labeling_test.py
index 25206b1..41a7175 100755
--- a/tests/formats_test/labeling_test.py
+++ b/tests/formats_test/labeling_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import unittest
+import unittest2 as unittest
 
 from tests import loopbackedtestcase
 from blivet.formats import device_formats
diff --git a/tests/formats_test/selinux_test.py b/tests/formats_test/selinux_test.py
index 0c9d4c1..fcfae09 100755
--- a/tests/formats_test/selinux_test.py
+++ b/tests/formats_test/selinux_test.py
@@ -2,7 +2,7 @@
 import os
 import selinux
 import tempfile
-import unittest
+import unittest2 as unittest
 
 import blivet
 from tests import loopbackedtestcase
diff --git a/tests/imagebackedtestcase.py b/tests/imagebackedtestcase.py
index 322e781..82cde6b 100644
--- a/tests/imagebackedtestcase.py
+++ b/tests/imagebackedtestcase.py
@@ -1,6 +1,6 @@
 
 import os
-import unittest
+import unittest2 as unittest
 
 from blivet import Blivet
 from blivet import util
diff --git a/tests/loopbackedtestcase.py b/tests/loopbackedtestcase.py
index 9451ed1..2190588 100644
--- a/tests/loopbackedtestcase.py
+++ b/tests/loopbackedtestcase.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import os
 import subprocess
 
diff --git a/tests/parentlist_test.py b/tests/parentlist_test.py
index bce13a0..3915d22 100644
--- a/tests/parentlist_test.py
+++ b/tests/parentlist_test.py
@@ -1,5 +1,5 @@
 
-import unittest
+import unittest2 as unittest
 from blivet.devices import ParentList
 from blivet.devices import Device
 
diff --git a/tests/partitioning_test.py b/tests/partitioning_test.py
index f31154a..ecd5977 100644
--- a/tests/partitioning_test.py
+++ b/tests/partitioning_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import unittest
+import unittest2 as unittest
 from mock import Mock
 
 import parted
diff --git a/tests/size_test.py b/tests/size_test.py
index e60c6d1..d686aa8 100644
--- a/tests/size_test.py
+++ b/tests/size_test.py
@@ -23,7 +23,7 @@
 
 import locale
 import os
-import unittest
+import unittest2 as unittest
 
 from decimal import Decimal
 
diff --git a/tests/storagetestcase.py b/tests/storagetestcase.py
index 0b3f26d..b01a104 100644
--- a/tests/storagetestcase.py
+++ b/tests/storagetestcase.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import unittest
+import unittest2 as unittest
 from mock import Mock
 
 import parted
diff --git a/tests/tsort_test.py b/tests/tsort_test.py
index 640becd..53a0213 100644
--- a/tests/tsort_test.py
+++ b/tests/tsort_test.py
@@ -1,5 +1,5 @@
 
-import unittest
+import unittest2 as unittest
 import blivet.tsort
 
 class TopologicalSortTestCase(unittest.TestCase):
diff --git a/tests/udev_test.py b/tests/udev_test.py
index e3e817d..e671814 100644
--- a/tests/udev_test.py
+++ b/tests/udev_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import unittest
+import unittest2 as unittest
 import mock
 
 class UdevTest(unittest.TestCase):
diff --git a/tests/util_test.py b/tests/util_test.py
index 13b8d06..0c7c095 100644
--- a/tests/util_test.py
+++ b/tests/util_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import unittest
+import unittest2 as unittest
 from decimal import Decimal
 
 from blivet import util


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/c8336332bbc03c9fc53f619c1c7497ba73623648


More information about the anaconda-patches mailing list