56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
|
From 95b8f15629d6328f7c1bdf41ea3a764cccec9852 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
|
||
|
|
Date: Wed, 10 Jun 2020 23:49:54 +0000
|
||
|
|
Subject: [PATCH] Fix tests with newer dulwich.
|
||
|
|
|
||
|
|
---
|
||
|
|
breezy/git/tests/test_remote.py | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/breezy/git/tests/test_remote.py b/breezy/git/tests/test_remote.py
|
||
|
|
index 8f3bf0c770..9f1bcd3d62 100644
|
||
|
|
--- a/breezy/git/tests/test_remote.py
|
||
|
|
+++ b/breezy/git/tests/test_remote.py
|
||
|
|
@@ -151,7 +151,7 @@ class ParseHangupTests(TestCase):
|
||
|
|
def setUp(self):
|
||
|
|
super(ParseHangupTests, self).setUp()
|
||
|
|
try:
|
||
|
|
- HangupException(['foo'])
|
||
|
|
+ HangupException([b'foo'])
|
||
|
|
except TypeError:
|
||
|
|
self.skipTest('dulwich version too old')
|
||
|
|
|
||
|
|
@@ -162,18 +162,18 @@ def test_not_set(self):
|
||
|
|
def test_single_line(self):
|
||
|
|
self.assertEqual(
|
||
|
|
RemoteGitError('foo bar'),
|
||
|
|
- parse_git_hangup('http://', HangupException(['foo bar'])))
|
||
|
|
+ parse_git_hangup('http://', HangupException([b'foo bar'])))
|
||
|
|
|
||
|
|
def test_multi_lines(self):
|
||
|
|
self.assertEqual(
|
||
|
|
RemoteGitError('foo bar\nbla bla'),
|
||
|
|
parse_git_hangup(
|
||
|
|
- 'http://', HangupException(['foo bar', 'bla bla'])))
|
||
|
|
+ 'http://', HangupException([b'foo bar', b'bla bla'])))
|
||
|
|
|
||
|
|
def test_filter_boring(self):
|
||
|
|
self.assertEqual(
|
||
|
|
RemoteGitError('foo bar'), parse_git_hangup('http://', HangupException(
|
||
|
|
- ['=======', 'foo bar', '======'])))
|
||
|
|
+ [b'=======', b'foo bar', b'======'])))
|
||
|
|
|
||
|
|
def test_permission_denied(self):
|
||
|
|
self.assertEqual(
|
||
|
|
@@ -181,8 +181,8 @@ def test_permission_denied(self):
|
||
|
|
parse_git_hangup(
|
||
|
|
'http://',
|
||
|
|
HangupException(
|
||
|
|
- ['=======',
|
||
|
|
- 'You are not allowed to push code to this project.', '', '======'])))
|
||
|
|
+ [b'=======',
|
||
|
|
+ b'You are not allowed to push code to this project.', b'', b'======'])))
|
||
|
|
|
||
|
|
|
||
|
|
class TestRemoteGitBranchFormat(TestCase):
|