Bazaar

Merge lp://staging/~mbp/bzr/751824-whoami-test-failures-2.3 into lp://staging/bzr/2.3

751824-whoami-test-failures-2.3
Merge into 2.3

Proposed by Martin Pool on 2011-04-13

Status:

Merged

Approved by:

Martin Pool on 2011-04-13

Approved revision:

no longer in the source branch.

Merged at revision:

5639

Proposed branch:

lp://staging/~mbp/bzr/751824-whoami-test-failures-2.3

Merge into:

lp://staging/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://staging/~mbp/bzr/751824-whoami-test-failures-2.3

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
John A Meinel		2011-04-13	Pending
Review via email: mp+57436@code.staging.launchpad.net

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://bugs.launchpad.net/bzr/+bug/751824

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.

Revision history for this message

John A Meinel (jameinel) wrote on 2011-04-06: Posted in a previous version of this proposal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/06/2011 06:44 AM, Martin Pool wrote:
> 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://bugs.launchpad.net/bzr/+bug/751824
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/751824-whoami-test-failures-2.3/+merge/56503
>
> Fixes https://bugs.launchpad.net/bzr/+bug/751824
>
> 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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2cFH4ACgkQJdeBCYSNAAP/UQCgkPEHPtGgI2y6pPiftzHk8dlu
g3sAoM+E4jBKkdL2rIfMtrXD/p9nOuuY
=yX9q
-----END PGP SIGNATURE-----

review: Approve

Revision history for this message

Vincent Ladeuil (vila) wrote on 2011-04-06: Posted in a previous version of this proposal

    > It would be nicer if there was a process-scope configuration that
    > the tests could override to force this off, rather than
    > monkeypatching.

Hi-jacking the thread a bit: pedantically speaking, this is one example
of a config option that could be defined in /etc/bzr/bazaar.conf.

Supporting it in ~/.bazaar/bazaar.conf would still be an improvement
though.

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2011-04-06: Posted in a previous version of this proposal

sent to pqm by email

Revision history for this message

Martin Pool (mbp) wrote on 2011-04-13:

sent to pqm by email

Revision history for this message

Martin Pool (mbp) wrote on 2011-04-14:

sent to pqm by email