Merge lp:~gz/brz/override_whoami_tests into lp:brz

[Martin Packman]

Fix tests that need whoami not to be set.

Fix tests that need whoami not to be set

Add override_whoami helper that ensures whoami is not set. Had false
passes due to incomplete test isolation after rename.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/388/

=== modified file 'breezy/tests/blackbox/test_annotate.py'
--- breezy/tests/blackbox/test_annotate.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_annotate.py	2019-06-16 17:47:27 +0000
@@ -32,6 +32,7 @@
 from breezy.tests.matchers import ContainsNoVfsCalls
 from breezy.urlutils import joinpath
 
+from ..test_bedding import override_whoami
 
 class TestAnnotate(tests.TestCaseWithTransport):
 
@@ -187,11 +188,7 @@
 
     def test_annotate_edited_file_no_default(self):
         # Ensure that when no username is available annotate still works.
-        self.overrideEnv('EMAIL', None)
-        self.overrideEnv('BRZ_EMAIL', None)
-        # Also, make sure that it's not inferred from mailname.
-        self.overrideAttr(config, '_auto_user_id',
-                          lambda: (None, None))
+        override_whoami(self)
         tree = self._setup_edited_file()
         out, err = self.run_bzr('annotate file')
         self.assertEqual(

=== modified file 'breezy/tests/blackbox/test_commit.py'
--- breezy/tests/blackbox/test_commit.py	2018-11-16 11:37:47 +0000
+++ breezy/tests/blackbox/test_commit.py	2019-06-16 17:47:27 +0000
@@ -38,6 +38,7 @@
     )
 from .. import TestCaseWithTransport
 from ..matchers import ContainsNoVfsCalls
+from ..test_bedding import override_whoami
 
 
 class TestCommit(TestCaseWithTransport):
@@ -868,11 +869,7 @@
         with open('foo/foo.txt', 'w') as f:
             f.write('hello')
         self.run_bzr(['add'], working_dir='foo')
-        self.overrideEnv('EMAIL', None)
-        self.overrideEnv('BRZ_EMAIL', None)
-        # Also, make sure that it's not inferred from mailname.
-        self.overrideAttr(config, '_auto_user_id',
-                          lambda: (None, None))
+        override_whoami(self)
         self.run_bzr_error(
             ['Unable to determine your name'],
             ['commit', '-m', 'initial'], working_dir='foo')

=== modified file 'breezy/tests/blackbox/test_whoami.py'
--- breezy/tests/blackbox/test_whoami.py	2019-06-16 01:03:51 +0000
+++ breezy/tests/blackbox/test_whoami.py	2019-06-16 17:47:27 +0000
@@ -17,7 +17,6 @@
 
 """Black-box tests for brz whoami."""
 
-import breezy
 from breezy import (
     branch,
     config,
@@ -26,6 +25,8 @@
     )
 from breezy.sixish import PY3
 
+from ..test_bedding import override_whoami
+
 
 class TestWhoami(tests.TestCaseWithTransport):
 
@@ -60,7 +61,7 @@
     def test_whoami_branch(self):
         """branch specific user identity works."""
         wt = self.make_branch_and_tree('.')
-        b = breezy.branch.Branch.open('.')
+        b = branch.Branch.open('.')
         self.set_branch_email(b, 'Branch Identity <[e-mail]>')
         self.assertWhoAmI('Branch Identity <[e-mail]>')
         self.assertWhoAmI('[e-mail]', '--email')
@@ -85,7 +86,7 @@
         encoding.
         """
         wt = self.make_branch_and_tree('.')
-        b = breezy.branch.Branch.open('.')
+        b = branch.Branch.open('.')
         self.set_branch_email(b, u'Branch Identity \u20ac <[e-mail]>')
         self.assertWhoAmI('Branch Identity ? <[e-mail]>',
                           encoding='ascii')
@@ -103,10 +104,7 @@
     def test_whoami_not_set(self):
         """Ensure whoami error if username is not set and not inferred.
         """
-        self.overrideEnv('EMAIL', None)
-        self.overrideEnv('BRZ_EMAIL', None)
-        # Also, make sure that it's not inferred from mailname.
-        self.overrideAttr(config, '_auto_user_id', lambda: (None, None))
+        override_whoami(self)
         out, err = self.run_bzr(['whoami'], 3)
         self.assertContainsRe(err, 'Unable to determine your name')
 
@@ -141,9 +139,7 @@
                          c.get('email'))
         # Ensuring that the value does not come from the breezy.conf file
         # itself requires some isolation setup
-        self.overrideEnv('BRZ_EMAIL', None)
-        self.overrideEnv('EMAIL', None)
-        self.overrideAttr(config, '_auto_user_id', lambda: (None, None))
+        override_whoami(self)
         global_conf = config.GlobalStack()
         self.assertRaises(errors.NoWhoami, global_conf.get, 'email')
 

=== modified file 'breezy/tests/per_repository/test_commit_builder.py'
--- breezy/tests/per_repository/test_commit_builder.py	2019-06-16 01:03:51 +0000
+++ breezy/tests/per_repository/test_commit_builder.py	2019-06-16 17:47:27 +0000
@@ -35,6 +35,8 @@
     features,
     )
 
+from ..test_bedding import override_whoami
+
 
 class TestCommitBuilder(per_repository.TestCaseWithRepository):
 
@@ -849,11 +851,7 @@
     def test_committer_no_username(self):
         # Ensure that when no username is available but a committer is
         # supplied, commit works.
-        self.overrideEnv('EMAIL', None)
-        self.overrideEnv('BRZ_EMAIL', None)
-        # Also, make sure that it's not inferred from mailname.
-        self.overrideAttr(config, '_auto_user_id',
-                          lambda: (None, None))
+        override_whoami(self)
         tree = self.make_branch_and_tree(".")
         with tree.lock_write():
             # Make sure no username is available.

=== modified file 'breezy/tests/test_bedding.py'
--- breezy/tests/test_bedding.py	2019-06-16 01:03:51 +0000
+++ breezy/tests/test_bedding.py	2019-06-16 17:47:27 +0000
@@ -30,6 +30,13 @@
     )
 
 
+def override_whoami(test):
+    test.overrideEnv('EMAIL', None)
+    test.overrideEnv('BRZ_EMAIL', None)
+    # Also, make sure that it's not inferred from mailname.
+    test.overrideAttr(bedding, '_auto_user_id', lambda: (None, None))
+
+
 class TestConfigPath(tests.TestCase):
 
     def setUp(self):