dulwich-users team mailing list archive

[dborowitz@xxxxxxxxxx]

From: Dave Borowitz <dborowitz@xxxxxxxxxx>

Change-Id: I3a76abde3fce91650f163a3c7f759ce31dfa7dbc
---
 dulwich/tests/test_client.py |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dulwich/tests/test_client.py b/dulwich/tests/test_client.py
index 9390be1..38193bd 100644
--- a/dulwich/tests/test_client.py
+++ b/dulwich/tests/test_client.py
@@ -59,9 +59,12 @@ class GitClientTests(TestCase):
                           set(self.client._send_capabilities))
 
     def test_fetch_pack_none(self):
-        self.rin.write(
-            '008855dcc6bf963f922e1ed5c4bbaaefcfacef57b1d7 HEAD.multi_ack thin-pack side-band side-band-64k ofs-delta shallow no-progress include-tag\n'
-            '0000')
+        self.rin.write('\n'.join([
+          ('008855dcc6bf963f922e1ed5c4bbaaefcfacef57b1d7 HEAD\0'
+           'multi_ack thin-pack side-band side-band-64k ofs-delta shallow '
+           'no-progress include-tag'),
+          ('0000'),
+          ]))
         self.rin.seek(0)
         self.client.fetch_pack('bla', lambda heads: [], None, None, None)
         self.assertEquals(self.rout.getvalue(), '0000')
@@ -74,8 +77,11 @@ class SSHGitClientTests(TestCase):
         self.client = SSHGitClient('git.samba.org')
 
     def test_default_command(self):
-        self.assertEquals('git-upload-pack', self.client._get_cmd_path('upload-pack'))
+        self.assertEquals('git-upload-pack',
+                          self.client._get_cmd_path('upload-pack'))
 
     def test_alternative_command_path(self):
-        self.client.alternative_paths['upload-pack'] = '/usr/lib/git/git-upload-pack'
-        self.assertEquals('/usr/lib/git/git-upload-pack', self.client._get_cmd_path('upload-pack'))
+        alts = self.client.alternative_paths
+        alts['upload-pack'] = '/usr/lib/git/git-upload-pack'
+        self.assertEquals('/usr/lib/git/git-upload-pack',
+                          self.client._get_cmd_path('upload-pack'))
-- 
1.7.3.2.168.gd6b63