← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

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