/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_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge_directive.py
60
60
        self.assertContainsRe(md_text, "\\+e")
61
61
        md_text = self.run_bzr('merge-directive -r -2 ../tree2')[0]
62
62
        self.assertNotContainsRe(md_text, "\\+e")
63
 
        md_text = self.run_bzr('merge-directive -r -1..-2 ../tree2')[0].encode('utf-8')
 
63
        md_text = self.run_bzr(
 
64
            'merge-directive -r -1..-2 ../tree2')[0].encode('utf-8')
64
65
        md2 = merge_directive.MergeDirective.from_lines(
65
66
            md_text.splitlines(True))
66
67
        self.assertEqual(b'foo-id', md2.revision_id)
111
112
 
112
113
    def run_bzr_fakemail(self, *args, **kwargs):
113
114
        sendmail_calls = []
 
115
 
114
116
        def sendmail(self, from_, to, message):
115
117
            sendmail_calls.append((self, from_, to, message))
116
118
        connect_calls = []
 
119
 
117
120
        def connect(self, host='localhost', port=0):
118
121
            connect_calls.append((self, host, port))
 
122
 
119
123
        def has_extn(self, extension):
120
124
            return False
 
125
 
121
126
        def ehlo(self):
122
127
            return (200, 'Ok')
123
128
        old_sendmail = smtplib.SMTP.sendmail
150
155
        self.assertEqual(1, len(sendmail_calls))
151
156
        call = sendmail_calls[0]
152
157
        self.assertEqual(('jrandom@example.com', ['pqm@example.com']),
153
 
                call[1:3])
 
158
                         call[1:3])
154
159
        self.assertContainsRe(call[3], EMAIL1)
155
160
 
156
161
    def test_pull_raw(self):
214
219
        self.prepare_merge_directive()
215
220
        self.tree1.commit('baz', rev_id=b'baz-id')
216
221
        md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
217
 
                               '-r', '2', '/dev/null', '--bundle'])[0]
 
222
                                '-r', '2', '/dev/null', '--bundle'])[0]
218
223
        self.build_tree_contents([('../directive', md_text)])
219
224
        os.chdir('../tree2')
220
225
        self.run_bzr('merge ../directive')
241
246
        foo = self.make_branch_and_tree('foo')
242
247
        bar = self.make_branch_and_tree('bar')
243
248
        self.run_bzr_error(('No revisions to bundle.', ),
244
 
                            'merge-directive ../bar', working_dir='foo')
 
249
                           'merge-directive ../bar', working_dir='foo')
245
250
 
246
251
    def test_encoding_exact(self):
247
252
        tree1, tree2 = self.prepare_merge_directive()
248
253
        tree1.commit(u'messag\xe9')
249
 
        self.run_bzr('merge-directive ../tree2') # no exception raised
 
254
        self.run_bzr('merge-directive ../tree2')  # no exception raised
250
255
 
251
256
    def test_merge_directive_directory(self):
252
257
        """Test --directory option"""