/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_diff.py

  • Committer: Jelmer Vernooij
  • Date: 2019-07-25 23:22:30 UTC
  • mfrom: (7374 work)
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190725232230-9b4x1nn0m19j1oh0
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_diff.py
325
325
        output = self.run_bzr('diff -Fboo', retcode=1)
326
326
        self.assertTrue("BOO!" in output[0])
327
327
 
 
328
    def test_binary_diff_remove(self):
 
329
        tree = self.make_branch_and_tree('.')
 
330
        self.build_tree_contents([('a', b'\x00' * 20)])
 
331
        tree.add(['a'])
 
332
        tree.commit('add binary file')
 
333
        os.unlink('a')
 
334
        output = self.run_bzr('diff', retcode=1)
 
335
        self.assertEqual(
 
336
            "=== removed file 'a'\nBinary files old/a and new/a differ\n",
 
337
            output[0])
 
338
 
328
339
 
329
340
class TestCheckoutDiff(TestDiff):
330
341