/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: 2018-07-02 20:37:44 UTC
  • mfrom: (7025 work)
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180702203744-3i0bimk0r5pfzjzl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_diff.py
182
182
    def check_b2_vs_b1(self, cmd):
183
183
        # Compare branch2 vs branch1 using cmd and check the result
184
184
        out, err = self.run_bzr(cmd, retcode=1)
185
 
        self.assertEqual('', err)
186
 
        self.assertEqual("=== modified file 'file'\n"
187
 
                          "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
188
 
                          "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
189
 
                          "@@ -1,1 +1,1 @@\n"
190
 
                          "-new content\n"
191
 
                          "+contents of branch1/file\n"
192
 
                          "\n", subst_dates(out))
 
185
        self.assertEqual(b'', err)
 
186
        self.assertEqual(b"=== modified file 'file'\n"
 
187
                         b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
188
                         b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
189
                         b"@@ -1,1 +1,1 @@\n"
 
190
                         b"-new content\n"
 
191
                         b"+contents of branch1/file\n"
 
192
                         b"\n", subst_dates(out))
193
193
 
194
194
    def check_b1_vs_b2(self, cmd):
195
195
        # Compare branch1 vs branch2 using cmd and check the result
196
196
        out, err = self.run_bzr(cmd, retcode=1)
197
 
        self.assertEqual('', err)
198
 
        self.assertEqualDiff("=== modified file 'file'\n"
199
 
                              "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
200
 
                              "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
201
 
                              "@@ -1,1 +1,1 @@\n"
202
 
                              "-contents of branch1/file\n"
203
 
                              "+new content\n"
204
 
                              "\n", subst_dates(out))
 
197
        self.assertEqual(b'', err)
 
198
        self.assertEqualDiff(b"=== modified file 'file'\n"
 
199
                             b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
200
                             b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
201
                             b"@@ -1,1 +1,1 @@\n"
 
202
                             b"-contents of branch1/file\n"
 
203
                             b"+new content\n"
 
204
                             b"\n", subst_dates(out))
205
205
 
206
206
    def check_no_diffs(self, cmd):
207
207
        # Check that running cmd returns an empty diff
208
208
        out, err = self.run_bzr(cmd, retcode=0)
209
 
        self.assertEqual('', err)
210
 
        self.assertEqual('', out)
 
209
        self.assertEqual(b'', err)
 
210
        self.assertEqual(b'', out)
211
211
 
212
212
    def test_diff_branches(self):
213
213
        self.example_branches()
255
255
 
256
256
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
257
257
                                )
258
 
        self.assertEqual('', err)
259
 
        self.assertEqual('', out)
 
258
        self.assertEqual(b'', err)
 
259
        self.assertEqual(b'', out)
260
260
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
261
261
                                retcode=1)
262
 
        self.assertEqual('', err)
263
 
        self.assertEqualDiff("=== modified file 'file'\n"
264
 
                              "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
265
 
                              "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
266
 
                              "@@ -1,1 +1,1 @@\n"
267
 
                              "-new content\n"
268
 
                              "+contents of branch1/file\n"
269
 
                              "\n", subst_dates(out))
 
262
        self.assertEqual(b'', err)
 
263
        self.assertEqualDiff(b"=== modified file 'file'\n"
 
264
                             b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
265
                             b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
266
                             b"@@ -1,1 +1,1 @@\n"
 
267
                             b"-new content\n"
 
268
                             b"+contents of branch1/file\n"
 
269
                             b"\n", subst_dates(out))
270
270
 
271
271
    def example_branch2(self):
272
272
        branch1_tree = self.make_branch_and_tree('branch1')
394
394
            retcode=None)
395
395
        if 'Diff is not installed on this machine' in err:
396
396
            raise tests.TestSkipped("No external 'diff' is available")
397
 
        self.assertEqual('', err)
 
397
        self.assertEqual(b'', err)
398
398
        # We have to skip the stuff in the middle, because it depends
399
399
        # on time.time()
400
400
        self.assertStartsWith(
401
401
            out,
402
 
            "=== added file 'goodbye'\n"
403
 
            "--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
404
 
            "+++ new/goodbye\t")
405
 
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
406
 
                                 "+baz\n\n")
 
402
            b"=== added file 'goodbye'\n"
 
403
            b"--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
 
404
            b"+++ new/goodbye\t")
 
405
        self.assertEndsWith(out, b"\n@@ -0,0 +1 @@\n"
 
406
                                 b"+baz\n\n")
407
407
 
408
408
    def test_external_diff_options_and_using(self):
409
409
        """Test that the options are passed correctly to an external diff process"""
412
412
        self.build_tree_contents([('hello', b'Foo\n')])
413
413
        out, err = self.run_bzr('diff --diff-options -i --using diff',
414
414
                                    retcode=1)
415
 
        self.assertEqual("=== modified file 'hello'\n", out)
416
 
        self.assertEqual('', err)
 
415
        self.assertEqual(b"=== modified file 'hello'\n", out)
 
416
        self.assertEqual(b'', err)
417
417
 
418
418
 
419
419
class TestDiffOutput(DiffBase):