#1002 prioritize unittest2
Merged 5 years ago by mikem. Opened 5 years ago by tkopecek.
tkopecek/koji issue1001  into  master

@@ -1,5 +1,4 @@ 

  from __future__ import absolute_import

- import unittest

  import mock

  import rpm

  import tempfile

@@ -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 @@ 

  

  import os

  

+ try:

+     import unittest2 as unittest

+ except ImportError:

+     import unittest

+ 

  

  class TestImportCG(utils.CliTestCase):

  

@@ -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

  

file modified
+5 -1
@@ -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

@@ -1,6 +1,10 @@ 

  from __future__ import absolute_import

  import mock

- import unittest

+ 

+ try:

+     import unittest2 as unittest

+ except ImportError:

+     import unittest

  

  import kojihub

  

file modified
+5 -1
@@ -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