From 45f8e400d8d7423ceafb7da4a487a4bca098199e Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Jul 23 2018 13:41:08 +0000
Subject: prioritize unittest2


Make all imports consistent with
https://pagure.io/koji/issue/830

Fixes: https://pagure.io/koji/issue/1001

---

diff --git a/tests/test_builder/test_choose_taskarch.py b/tests/test_builder/test_choose_taskarch.py
index c198ab9..e5cd0dd 100644
--- a/tests/test_builder/test_choose_taskarch.py
+++ b/tests/test_builder/test_choose_taskarch.py
@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-import unittest
 import mock
 import rpm
 import tempfile
diff --git a/tests/test_cli/test_import_cg.py b/tests/test_cli/test_import_cg.py
index 1008371..3af9248 100644
--- a/tests/test_cli/test_import_cg.py
+++ b/tests/test_cli/test_import_cg.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 import mock
 import six
-import unittest
 
 from mock import call
 from koji_cli.commands import handle_import_cg
@@ -9,6 +8,11 @@ from . import utils
 
 import os
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 
 class TestImportCG(utils.CliTestCase):
 
diff --git a/tests/test_cli/test_spin_commands.py b/tests/test_cli/test_spin_commands.py
index 6578688..b50f528 100644
--- a/tests/test_cli/test_spin_commands.py
+++ b/tests/test_cli/test_spin_commands.py
@@ -1,9 +1,13 @@
 from __future__ import absolute_import
 import mock
 import six
-import unittest
-import koji
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
+import koji
 from koji_cli.commands import handle_spin_livecd, handle_spin_livemedia, handle_spin_appliance, _build_image
 from . import utils
 
diff --git a/tests/test_hub/test_repos.py b/tests/test_hub/test_repos.py
index 670bcfa..6cba32f 100644
--- a/tests/test_hub/test_repos.py
+++ b/tests/test_hub/test_repos.py
@@ -1,6 +1,10 @@
 from __future__ import absolute_import
 import mock
-import unittest
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 import koji
 import kojihub
diff --git a/tests/test_hub/test_savepoint.py b/tests/test_hub/test_savepoint.py
index a698721..b0f91b0 100644
--- a/tests/test_hub/test_savepoint.py
+++ b/tests/test_hub/test_savepoint.py
@@ -1,6 +1,10 @@
 from __future__ import absolute_import
 import mock
-import unittest
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 import kojihub
 
diff --git a/tests/test_www/test_util.py b/tests/test_www/test_util.py
index 8cc25b9..d3e1a05 100644
--- a/tests/test_www/test_util.py
+++ b/tests/test_www/test_util.py
@@ -1,5 +1,9 @@
 from __future__ import absolute_import
-import unittest
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from kojiweb.util import formatMode