← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
23
23
 
24
24
from bzrlib import (
25
25
    bzrdir,
 
26
    config,
26
27
    osutils,
27
28
    ignores,
28
29
    msgeditor,
758
759
        self.run_bzr(['add'])
759
760
        self.overrideEnv('EMAIL', None)
760
761
        self.overrideEnv('BZR_EMAIL', None)
 
762
        # Also, make sure that it's not inferred from mailname.
 
763
        self.overrideAttr(config, '_auto_user_id',
 
764
            lambda: (None, None))
761
765
        out, err = self.run_bzr(['commit', '-m', 'initial'], 3)
762
766
        self.assertContainsRe(err, 'Unable to determine your name')
763
767