deb component tests: bytes vs strings in paths

2 files changed, 8 insertions, 7 deletions

diff --git a/tests/component/deb/test_import_dsc.py b/tests/component/deb/test_import_dsc.py
index a0b5bfa4..45efafda 100644
--- a/tests/component/deb/test_import_dsc.py
+++ b/tests/component/deb/test_import_dsc.py
@@ -40,13 +40,13 @@ class TestImportDsc(ComponentTestBase):
         # update-ref HEAD HEAD" while older ones (2.9.4) don't so
         # reflog[0] is either there or not.
         if len(reflog) == 3:
-            ok_("gbp: Import Debian changes" in reflog[1])
-            ok_("gbp: Import Upstream version 2.6" in reflog[2])
+            ok_(b"gbp: Import Debian changes" in reflog[1])
+            ok_(b"gbp: Import Upstream version 2.6" in reflog[2])
         elif len(reflog) == 2:
             # Furthermore some older git versions (<2.10) fail to set
             # the reflog correctly on the initial commit so only check
             # the second
-            ok_("gbp: Import Debian changes" in reflog[0])
+            ok_(b"gbp: Import Debian changes" in reflog[0])
         else:
             assert ok_(len(reflog) in [2, 3])
 
@@ -163,7 +163,7 @@ class TestImportDsc(ComponentTestBase):
         ok_("hello-debhelper (2.8-1) unstable; urgency=low" in commitmsg)
         ok_("hello (1.3-7) experimental; urgency=LOW" in commitmsg)
 
-        for file in ['foo/test1', 'foo/test2']:
+        for file in [b'foo/test1', b'foo/test2']:
             ok_(file in repo.ls_tree('HEAD'),
                 "Could not find component tarball file %s in %s" % (file, repo.ls_tree('HEAD')))
 
diff --git a/tests/component/deb/test_import_orig.py b/tests/component/deb/test_import_orig.py
index bfd399bf..7947ca79 100644
--- a/tests/component/deb/test_import_orig.py
+++ b/tests/component/deb/test_import_orig.py
@@ -30,6 +30,7 @@ from gbp.scripts.import_orig import main as import_orig
 from gbp.deb.pristinetar import DebianPristineTar
 from gbp.deb.dscfile import DscFile
 from gbp.git.repository import GitRepository, GitRepositoryError
+from gbp.paths import to_bin
 
 from nose.tools import ok_, eq_, assert_raises
 
@@ -85,9 +86,9 @@ class TestImportOrig(ComponentTestBase):
 
     def _check_component_tarballs(self, repo, files):
         for file in files:
-            ok_(file in repo.ls_tree('HEAD'),
+            ok_(to_bin(file) in repo.ls_tree('HEAD'),
                 "Could not find component tarball file %s in %s" % (file, repo.ls_tree('HEAD')))
-            ok_(file in repo.ls_tree('upstream'),
+            ok_(to_bin(file) in repo.ls_tree('upstream'),
                 "Could not find component tarball file %s in %s" % (file, repo.ls_tree('upstream')))
 
     @RepoFixtures.quilt30(DEFAULT_DSC, opts=['--pristine-tar'])
@@ -117,7 +118,7 @@ class TestImportOrig(ComponentTestBase):
         ok_(import_orig(['arg0', '--component=foo', '--no-interactive', '--pristine-tar', orig]) == 0)
         self._check_repo_state(repo, 'master', ['master', 'upstream', 'pristine-tar'],
                                tags=['debian/2.6-2', 'upstream/2.6', 'upstream/2.8'])
-        self._check_component_tarballs(repo, ['foo/test1', 'foo/test2'])
+        self._check_component_tarballs(repo, [b'foo/test1', b'foo/test2'])
 
         dsc = DscFile.parse(_dsc_file(self.pkg, '2.8-1', dir='dsc-3.0-additional-tarballs'))
         # Check if we can rebuild the upstream tarball and additional tarball