Merge lp:~vila/bzr/1622039-diff-binaries into lp:bzr

[Vincent Ladeuil]

Fix test failure for recent versions of diff.

This fixes bug #1622039 and needs special care to land on lp:bzr (the new CI now runs on xenial where this fails among other things).

=== modified file 'bzrlib/tests/test_diff.py'
--- bzrlib/tests/test_diff.py	2016-02-01 18:06:32 +0000
+++ bzrlib/tests/test_diff.py	2017-01-17 15:16:25 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2012, 2014, 2016 Canonical Ltd
+# Copyright (C) 2005-2012, 2014, 2016, 2017 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -313,8 +313,6 @@
         pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                      stdin=subprocess.PIPE)
         out, err = pipe.communicate()
-        # Diff returns '2' on Binary files.
-        self.assertEqual(2, pipe.returncode)
         # We should output whatever diff tells us, plus a trailing newline
         self.assertEqual(out.splitlines(True) + ['\n'], lines)
 

=== modified file 'doc/en/release-notes/bzr-2.8.txt'
--- doc/en/release-notes/bzr-2.8.txt	2016-04-03 16:32:31 +0000
+++ doc/en/release-notes/bzr-2.8.txt	2017-01-17 15:16:25 +0000
@@ -56,10 +56,9 @@
 Testing
 *******
 
-.. Fixes and changes that are only relevant to bzr's test framework and 
-   suite.  This can include new facilities for writing tests, fixes to 
-   spurious test failures and changes to the way things should be tested.
-
+* POSIX mandates diff to exit with status 1 (was 2 previously), bzr didn't
+  rely on that feature but one of the tests did.
+  (Vincent Ladeuil, #1622039)
 
 ..
    vim: tw=74 ft=rst ff=unix