diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-28 11:20:14 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-28 11:30:05 +0200 |
| commit | 04ae7d5654684d8077a4125c90e36f4195057fa9 (patch) | |
| tree | 83538a1c3d496ac90234cef9a323d5db1688812c /tests/13_test_gbp_pq.py | |
| parent | 67cdeac2490839fb9071c634d9ac5c0af0653750 (diff) | |
git: Don't decode diff output
The output can be in any encoding so assuming utf-8 is plain wrong
Diffstat (limited to 'tests/13_test_gbp_pq.py')
| -rw-r--r-- | tests/13_test_gbp_pq.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py index bafe7cf0..b9a373a0 100644 --- a/tests/13_test_gbp_pq.py +++ b/tests/13_test_gbp_pq.py @@ -148,7 +148,7 @@ class TestWritePatch(testutils.DebianGitTestRepo): self.repo.commit_all("foo") diff = self.repo.diff('master', 'testapply') # Branches must be identical afterwards - self.assertEqual('', diff) + self.assertEqual(b'', diff) def test_generate_patches(self): """Test generation of patches""" @@ -352,24 +352,24 @@ class TestFromTAG(testutils.DebianGitTestRepo): pq_from=TestFromTAG.Options.pq_from, upstream_tag=TestFromTAG.Options.upstream_tag) diff = self.repo.diff(self.repo.get_branch(), 'upstream/0.0.1') - self.assertEqual('', diff) + self.assertEqual(b'', diff) diff = self.repo.diff(self.repo.get_branch(), 'master') - self.assertNotEqual('', diff) + self.assertNotEqual(b'', diff) rebase_pq(self.repo, branch=self.repo.get_branch(), pq_from=TestFromTAG.Options.pq_from, upstream_tag=TestFromTAG.Options.upstream_tag) diff = self.repo.diff(self.repo.get_branch(), 'upstream/0.0.1') - self.assertEqual('', diff) + self.assertEqual(b'', diff) diff = self.repo.diff(self.repo.get_branch(), 'master') - self.assertNotEqual('', diff) + self.assertNotEqual(b'', diff) export_patches(self.repo, branch=self.repo.get_branch(), options=TestFromTAG.Options()) diff = self.repo.diff(self.repo.get_branch(), self.repo.head) - self.assertEqual('', diff) + self.assertEqual(b'', diff) def test_adding_patch(self): import_quilt_patches(self.repo, |