← 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: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

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().set_user_option('smtp_server', 'bogushost')
 
226
        tree1.branch.get_config_stack().set('smtp_server', 'bogushost')
227
227
        md_text, errr, connect_calls, sendmail_calls =\
228
228
            self.run_bzr_fakemail('merge-directive --mail-to'
229
229
                                  ' pqm@example.com --plain ../tree2 .')