← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_commit_builder.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/per_repository/test_commit_builder.py
19
19
import os
20
20
 
21
21
from bzrlib import (
 
22
    config,
22
23
    errors,
23
24
    graph,
24
25
    inventory,
1361
1362
        # Ensure that when no username is available but a committer is
1362
1363
        # supplied, commit works.
1363
1364
        self.overrideEnv('EMAIL', None)
 
1365
        self.overrideEnv('BZR_EMAIL', None)
 
1366
        # Also, make sure that it's not inferred from mailname.
 
1367
        self.overrideAttr(config, '_auto_user_id',
 
1368
            lambda: (None, None))
1364
1369
        tree = self.make_branch_and_tree(".")
1365
1370
        tree.lock_write()
1366
1371
        try: