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

[Martin Pool]

Update tests for no user identity being configured so they work when one can be inferred.

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.

[John A Meinel (jameinel)]

-----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

[Vincent Ladeuil (vila)]

    > 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.

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2011-01-10 22:20:12 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2011-04-06 04:42:44 +0000
@@ -23,6 +23,7 @@
 
 from bzrlib import (
     bzrdir,
+    config,
     osutils,
     ignores,
     msgeditor,
@@ -758,6 +759,9 @@
         self.run_bzr(['add'])
         self.overrideEnv('EMAIL', None)
         self.overrideEnv('BZR_EMAIL', None)
+        # Also, make sure that it's not inferred from mailname.
+        self.overrideAttr(config, '_auto_user_id',
+            lambda: (None, None))
         out, err = self.run_bzr(['commit', '-m', 'initial'], 3)
         self.assertContainsRe(err, 'Unable to determine your name')
 

=== modified file 'bzrlib/tests/blackbox/test_whoami.py'
--- bzrlib/tests/blackbox/test_whoami.py	2011-01-18 22:30:23 +0000
+++ bzrlib/tests/blackbox/test_whoami.py	2011-04-06 04:42:44 +0000
@@ -94,10 +94,13 @@
                           'recommended.\n', display)
 
     def test_whoami_not_set(self):
-        """Ensure whoami error if username is not set.
+        """Ensure whoami error if username is not set and not inferred.
         """
         self.overrideEnv('EMAIL', None)
         self.overrideEnv('BZR_EMAIL', None)
+        # Also, make sure that it's not inferred from mailname.
+        self.overrideAttr(config, '_auto_user_id',
+            lambda: (None, None))
         out, err = self.run_bzr(['whoami'], 3)
         self.assertContainsRe(err, 'Unable to determine your name')
 

=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- bzrlib/tests/per_repository/test_commit_builder.py	2011-03-13 15:22:28 +0000
+++ bzrlib/tests/per_repository/test_commit_builder.py	2011-04-06 04:42:44 +0000
@@ -19,6 +19,7 @@
 import os
 
 from bzrlib import (
+    config,
     errors,
     graph,
     inventory,
@@ -1361,6 +1362,10 @@
         # Ensure that when no username is available but a committer is
         # supplied, commit works.
         self.overrideEnv('EMAIL', None)
+        self.overrideEnv('BZR_EMAIL', None)
+        # Also, make sure that it's not inferred from mailname.
+        self.overrideAttr(config, '_auto_user_id',
+            lambda: (None, None))
         tree = self.make_branch_and_tree(".")
         tree.lock_write()
         try: