← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 15:27:00 UTC
  • mfrom: (6619.2.1 1622039-diff-binaries)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117152700-d0l1z87gbbrlwdix
Merge bugfix for #1622039

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1
 
# Copyright (C) 2005-2012, 2014, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2014, 2016, 2017 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
313
313
        pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
314
314
                                     stdin=subprocess.PIPE)
315
315
        out, err = pipe.communicate()
316
 
        # Diff returns '2' on Binary files.
317
 
        self.assertEqual(2, pipe.returncode)
318
316
        # We should output whatever diff tells us, plus a trailing newline
319
317
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
320
318