/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/git/tests/test_blackbox.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-02-14 04:20:37 UTC
  • mfrom: (7268.7.1 fix-git-apply)
  • Revision ID: breezy.the.bot@gmail.com-20190214042037-i3uuz259ea38eo73
Fix git-apply and add a test.

Merged from https://code.launchpad.net/~jelmer/brz/fix-git-apply/+merge/362955

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_blackbox.py
455
455
 
456
456
    def test_in_bzr(self):
457
457
        self.run_simple(format='2a')
 
458
 
 
459
 
 
460
class GitApplyTests(ExternalBase):
 
461
 
 
462
    def test_apply(self):
 
463
        b = self.make_branch_and_tree('.')
 
464
 
 
465
        with open('foo.patch', 'w') as f:
 
466
            f.write("""\
 
467
From bdefb25fab801e6af0a70e965f60cb48f2b759fa Mon Sep 17 00:00:00 2001
 
468
From: Dmitry Bogatov <KAction@debian.org>
 
469
Date: Fri, 8 Feb 2019 23:28:30 +0000
 
470
Subject: [PATCH] Add fixed for out-of-date-standards-version
 
471
 
 
472
---
 
473
 message           | 3 +++
 
474
 1 files changed, 14 insertions(+)
 
475
 create mode 100644 message
 
476
 
 
477
diff --git a/message b/message
 
478
new file mode 100644
 
479
index 0000000..05ec0b1
 
480
--- /dev/null
 
481
+++ b/message
 
482
@@ -0,0 +1,3 @@
 
483
+Update standards version, no changes needed.
 
484
+Certainty: certain
 
485
+Fixed-Lintian-Tags: out-of-date-standards-version
 
486
""")
 
487
        output, error = self.run_bzr('git-apply foo.patch')
 
488
        self.assertContainsRe(
 
489
            error,
 
490
            'Committing to: .*\n'
 
491
            'Committed revision 1.\n')