Merge lp:~mbp/bzr/751824-whoami-test-failures-2.3 into lp:bzr/2.3
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Martin Pool | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5639 | ||||
Proposed branch: | lp:~mbp/bzr/751824-whoami-test-failures-2.3 | ||||
Merge into: | lp:bzr/2.3 | ||||
Diff against target: |
63 lines (+13/-1) 3 files modified
bzrlib/tests/blackbox/test_commit.py (+4/-0) bzrlib/tests/blackbox/test_whoami.py (+4/-1) bzrlib/tests/per_repository/test_commit_builder.py (+5/-0) |
||||
To merge this branch: | bzr merge lp:~mbp/bzr/751824-whoami-test-failures-2.3 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2011-04-06.
Commit message
Tests for no user identity being set must cope with machines that have a mailname.
Description of the change
Fixes https:/
This updates some tests for no user identity being configured so they work properly when one can be inferred from /etc/mailname. I infer this passed through pqm the first time because mailname is not set there. I have now run the whole thing locally and there are no problems.
It would be nicer if there was a process-scope configuration that the tests could override to force this off, rather than monkeypatching.
This was meant to go into 2.3, but in the previous iteration was accidentally merged only to trunk.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 04/06/2011 06:44 AM, Martin Pool wrote: /bugs.launchpad .net/bzr/ +bug/751824 /code.launchpad .net/~mbp/ bzr/751824- whoami- test-failures- 2.3/+merge/ 56503 /bugs.launchpad .net/bzr/ +bug/751824
> Martin Pool has proposed merging lp:~mbp/bzr/751824-whoami-test-failures-2.3 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #751824 in Bazaar: "whoami-related test failures with bzr.dev"
> https:/
>
> For more details, see:
> https:/
>
> Fixes https:/
>
> This updates some tests for no user identity being configured so they work properly when one can be inferred from /etc/mailname. I infer this passed through pqm the first time because mailname is not set there. I have now run the whole thing locally and there are no problems.
>
> It would be nicer if there was a process-scope configuration that the tests could override to force this off, rather than monkeypatching.
merge: approve enigmail. mozdev. org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk2 cFH4ACgkQJdeBCY SNAAP/UQCgkPEHP tGgI2y6pPiftzHk 8dlu E4jBKkdL2rIfMtr XD/p9nOuuY
g3sAoM+
=yX9q
-----END PGP SIGNATURE-----