← 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-01-05 16:03:11 UTC
  • mfrom: (6432 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6433.
  • Revision ID: jelmer@samba.org-20120105160311-12o5p67kin1v3zps
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
44
44
    def prepare_merge_directive(self):
45
45
        self.tree1 = self.make_branch_and_tree('tree1')
46
46
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\n')])
47
 
        self.tree1.branch.get_config().set_user_option('email',
48
 
            'J. Random Hacker <jrandom@example.com>')
 
47
        self.tree1.branch.get_config_stack().set(
 
48
            'email', 'J. Random Hacker <jrandom@example.com>')
49
49
        self.tree1.add('file')
50
50
        self.tree1.commit('foo', rev_id='foo-id')
51
51
        self.tree2 = self.tree1.bzrdir.sprout('tree2').open_workingtree()
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 .')