← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
223
223
 
224
224
    def test_mail_uses_config(self):
225
225
        tree1, tree2 = self.prepare_merge_directive()
226
 
        tree1.branch.get_config_stack().set('smtp_server', 'bogushost')
 
226
        br = tree1.branch
 
227
        br.get_config_stack().set('smtp_server', 'bogushost')
227
228
        md_text, errr, connect_calls, sendmail_calls =\
228
229
            self.run_bzr_fakemail('merge-directive --mail-to'
229
230
                                  ' pqm@example.com --plain ../tree2 .')