CentOS compatibility: fix tests

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/tests/01_test_help.py b/tests/01_test_help.py
index 07051785635c7efaadcf0aaa85770ccab357e09a..68a6940b08ba931f7c87f8cf5bc5e4b63e0009ab 100644 (file)
--- a/tests/01_test_help.py
+++ b/tests/01_test_help.py
@@ -4,7 +4,11 @@
 
 from . import context
 
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 class TestHelp(unittest.TestCase):
     """Test help output of gbp commands"""

diff --git a/tests/02_test_upstream_source_tar_unpack.py b/tests/02_test_upstream_source_tar_unpack.py
index 97bf76bbc22bac2a93183a8d474081daeb678dcb..e6147abd3250011814696b7c7f3b3698096e1cda 100644 (file)
--- a/tests/02_test_upstream_source_tar_unpack.py
+++ b/tests/02_test_upstream_source_tar_unpack.py
@@ -8,7 +8,11 @@ import os
 import shutil
 import tarfile
 import tempfile
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 import gbp.pkg
 

diff --git a/tests/05_test_detection.py b/tests/05_test_detection.py
index 126a299241c629834d3fa98424a8efddc5b2e8d7..c3f729bacf05086e2e12d53856bf3fe6c8310912 100644 (file)
--- a/tests/05_test_detection.py
+++ b/tests/05_test_detection.py
@@ -4,7 +4,11 @@
 
 from . import context
 
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from gbp.scripts import buildpackage
 from gbp.deb import (DebianPkgPolicy, orig_file)

diff --git a/tests/06_test_upstream_source.py b/tests/06_test_upstream_source.py
index c6df6f14f6eaae3bdf4e14a745e3e662e2766995..6b2a1a1efdce930f96f95716dd20a678cd125297 100644 (file)
--- a/tests/06_test_upstream_source.py
+++ b/tests/06_test_upstream_source.py
@@ -9,7 +9,11 @@ import os
 import shutil
 import tarfile
 import tempfile
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import zipfile
 
 from gbp.pkg import UpstreamSource

diff --git a/tests/08_test_patch.py b/tests/08_test_patch.py
index df1d43d4d4f8f5f60ded1e03a3293afdf25e611a..dd1532e21f81bb75676147b57b064ef34f1d6abe 100644 (file)
--- a/tests/08_test_patch.py
+++ b/tests/08_test_patch.py
@@ -5,7 +5,11 @@
 from . import context
 
 import os
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from gbp.patch_series import Patch
 

diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py
index dbfc25cd6dab31e1c044f6b20930139b607904a0..9bdc5c5b812b2330c68457a5ea14a5f3c436190a 100644 (file)
--- a/tests/11_test_dch_main.py
+++ b/tests/11_test_dch_main.py
@@ -4,7 +4,11 @@
 
 from . import context
 
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from tests.testutils import (DebianGitTestRepo, OsReleaseFile,
                              get_dch_default_urgency)

diff --git a/tests/12_test_deb.py b/tests/12_test_deb.py
index d46f987c2597f88daa85d69efb3a6a88f572971b..2be30976d1efbd3b681dfabddd0c93fd9c0feb01 100644 (file)
--- a/tests/12_test_deb.py
+++ b/tests/12_test_deb.py
@@ -4,7 +4,12 @@
 
 from . import context
 
-import os, tempfile, unittest
+import os, tempfile
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 import gbp.deb
 

diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py
index 7e78b153c82c7e4f2094c7c1f4e8aaa3b9bc2ae2..0b400c21ffba043d364a2e642361df1f7098a0f8 100644 (file)
--- a/tests/13_test_gbp_pq.py
+++ b/tests/13_test_gbp_pq.py
@@ -19,7 +19,11 @@ from . import context
 
 import os
 import logging
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from gbp.scripts.pq import generate_patches
 import gbp.scripts.common.pq as pq

diff --git a/tests/16_test_supercommand.py b/tests/16_test_supercommand.py
index f72bb5622f63c8fa358c92e5a590d3991ded4914..296ef8ed7d49121e8e9a68a20a392da82420b22c 100644 (file)
--- a/tests/16_test_supercommand.py
+++ b/tests/16_test_supercommand.py
@@ -16,7 +16,11 @@
 """Test L{gbp} command wrapper"""
 
 import sys
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import gbp.scripts.supercommand
 
 class TestSuperCommand(unittest.TestCase):

diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py
index c9a1a429fd2875f7351f3624fb54db9de839ebe3..f6ee0ed0bce813bfd177830ee0066a5ce2d59e16 100644 (file)
--- a/tests/component/rpm/test_import_srpm.py
+++ b/tests/component/rpm/test_import_srpm.py
@@ -48,8 +48,8 @@ class TestImportPacked(ComponentTestBase):
         assert import_srpm(['arg0', srpm]) == 0
         # Check repository state
         repo = GitRepository('gbp-test')
-        files =  {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt',
-                  'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt'}
+        files =  set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt',
+                  'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt'])
         self._check_repo_state(repo, 'master', ['master', 'upstream'], files)
         # Four commits: upstream, packaging files, one patch and the removal
         # of imported patches
@@ -61,9 +61,9 @@ class TestImportPacked(ComponentTestBase):
         assert import_srpm(['arg0', srpm]) == 0
         # Check repository state
         repo = GitRepository('gbp-test2')
-        files = {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt',
+        files = set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt',
                  'gbp-test2.spec', 'gbp-test2-alt.spec', 'my.patch', 'mydir/',
-                 'mydir/myfile.txt'}
+                 'mydir/myfile.txt'])
         self._check_repo_state(repo, 'master', ['master', 'upstream'], files)
 
         # Four commits: upstream, packaging files, one patch and the removal
@@ -79,8 +79,8 @@ class TestImportPacked(ComponentTestBase):
         assert import_srpm(['arg0', '--orphan-packaging', srpm]) == 0
         # Check repository state
         repo = GitRepository('gbp-test2')
-        files = {'bar.tar.gz', 'foo.txt', 'gbp-test2.spec',
-                 'gbp-test2-alt.spec', 'my.patch', 'my2.patch', 'my3.patch'}
+        files = set(['bar.tar.gz', 'foo.txt', 'gbp-test2.spec',
+                 'gbp-test2-alt.spec', 'my.patch', 'my2.patch', 'my3.patch'])
         self._check_repo_state(repo, 'master', ['master', 'upstream'], files)
         # Only one commit: the packaging files
         assert len(repo.get_commits()) == 1
@@ -90,8 +90,8 @@ class TestImportPacked(ComponentTestBase):
         srpm = os.path.join(DATA_DIR, 'gbp-test-native-1.0-1.src.rpm')
         assert import_srpm(['arg0', '--native', srpm]) == 0
         # Check repository state
-        files = {'.gbp.conf', 'Makefile', 'README', 'dummy.sh', 'packaging/',
-                 'packaging/gbp-test-native.spec'}
+        files = set(['.gbp.conf', 'Makefile', 'README', 'dummy.sh',
+                     'packaging/', 'packaging/gbp-test-native.spec'])
         repo = GitRepository('gbp-test-native')
         self._check_repo_state(repo, 'master', ['master'], files)
         # Only one commit: the imported source tarball
@@ -126,8 +126,8 @@ class TestImportPacked(ComponentTestBase):
         assert len(repo.get_commits(until='upstream')) == 1
         # Import new version
         assert import_srpm(['arg0', srpms[2]]) == 0
-        files = {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt',
-                 'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt'}
+        files = set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt',
+                 'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt'])
         self._check_repo_state(repo, 'master', ['master', 'upstream'], files)
         assert len(repo.get_commits()) == 11
         assert len(repo.get_commits(until='upstream')) == 2
@@ -195,11 +195,11 @@ class TestImportPacked(ComponentTestBase):
                     srpm]) == 0
         # Check repository state
         repo = GitRepository('gbp-test2')
-        files = {'Makefile', 'README', 'dummy.sh', 'packaging/',
+        files = set(['Makefile', 'README', 'dummy.sh', 'packaging/',
                  'packaging/bar.tar.gz', 'packaging/foo.txt',
                  'packaging/gbp-test2.spec', 'packaging/gbp-test2-alt.spec',
                  'packaging/my.patch', 'packaging/my2.patch',
-                 'packaging/my3.patch'}
+                 'packaging/my3.patch'])
         self._check_repo_state(repo, 'pack', ['pack', 'orig'], files)
         assert len(repo.get_commits()) == 2
         # Check packaging dir

diff --git a/tests/test_rpm.py b/tests/test_rpm.py
index 3a6e6ceb55c781d62e275b7b874eca53ba47e9ed..4fb3b0ca0cdc569473d5659d516902c36c3fa9bb 100644 (file)
--- a/tests/test_rpm.py
+++ b/tests/test_rpm.py
@@ -253,8 +253,10 @@ class TestSpecFile(object):
                                               (name, val['value'], rval))
             assert spec.ignorepatches == []
             # Check patch numbers and patch filenames
-            patches = {patch['num']: patch['linevalue'] for patch in
-                       spec.protected('_tags')['patch']['lines']}
+            patches = {}
+            for patch in spec.protected('_tags')['patch']['lines']:
+                patches[patch['num']] = patch['linevalue']
+
             assert patches == {0: 'my_patch0', -1: 'my_patch'}
 
     def test_patch_series(self):

diff --git a/tests/testutils.py b/tests/testutils.py
index a6cad94b71a9b2a22eddb9e7ec99df07cf0a65f9..31845be89b80e63b48a7eaab2740efab7a56071d 100644 (file)
--- a/tests/testutils.py
+++ b/tests/testutils.py
@@ -7,7 +7,11 @@ import shutil
 import subprocess
 import tarfile
 import tempfile
-import unittest
+# Try unittest2 for CentOS
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import zipfile
 
 import gbp.log