Only check last line in blackbox output, as pypy outputs extra lines.
authorJelmer Vernooij <jelmer@jelmer.uk>
Thu, 10 Sep 2015 22:54:19 +0000 (22:54 +0000)
committerJelmer Vernooij <jelmer@jelmer.uk>
Thu, 10 Sep 2015 22:55:30 +0000 (22:55 +0000)
dulwich/tests/test_blackbox.py

index c265f513b6076297200af83fcc8f5988ce5d4419..d288f26faa18c7bdae74833ebbdb278ebeb69119 100644 (file)
@@ -41,14 +41,15 @@ class GitReceivePackTests(BlackboxTestCase):
     def test_basic(self):
         process = self.run_command("dul-receive-pack", [self.path])
         (stdout, stderr) = process.communicate(b"0000")
-        self.assertEqual(b'', stderr, stderr)
         self.assertEqual(b'0000', stdout[-4:])
         self.assertEqual(0, process.returncode)
 
     def test_missing_arg(self):
         process = self.run_command("dul-receive-pack", [])
         (stdout, stderr) = process.communicate()
-        self.assertEqual([b'usage: dul-receive-pack <git-dir>'], stderr.splitlines())
+        self.assertEqual(
+            [b'usage: dul-receive-pack <git-dir>'],
+            stderr.splitlines()[:-1])
         self.assertEqual(b'', stdout)
         self.assertEqual(1, process.returncode)
 
@@ -65,6 +66,8 @@ class GitUploadPackTests(BlackboxTestCase):
     def test_missing_arg(self):
         process = self.run_command("dul-upload-pack", [])
         (stdout, stderr) = process.communicate()
-        self.assertEqual([b'usage: dul-upload-pack <git-dir>'], stderr.splitlines())
+        self.assertEqual(
+            [b'usage: dul-upload-pack <git-dir>'],
+            stderr.splitlines()[:-1])
         self.assertEqual(b'', stdout)
         self.assertEqual(1, process.returncode)