Rev 5992: Slightly simplify whoami tests in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 5992 [merge]
revision-id: v.ladeuil+lp at free.fr-20110622091104-cv347e594887y0rn
parent: pqm at pqm.ubuntu.com-20110621172728-3203vaenqctilpd7
parent: v.ladeuil+lp at free.fr-20110622090935-dlwjl7h3209ldzj5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Wed 2011-06-22 11:11:04 +0200
message:
  Slightly simplify whoami tests
modified:
  bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_whoami.py'
--- a/bzrlib/tests/blackbox/test_whoami.py	2011-04-06 11:07:17 +0000
+++ b/bzrlib/tests/blackbox/test_whoami.py	2011-06-22 09:09:35 +0000
@@ -20,18 +20,26 @@
 import bzrlib
 from bzrlib import (
     config,
+    tests,
     )
-from bzrlib.tests import TestCaseWithTransport
-
-
-class TestWhoami(TestCaseWithTransport):
-
-    def test_whoami(self):
+
+
+class TestWhoami(tests.TestCaseWithTransport):
+
+    def assertWhoAmI(self, expected, *cmd_args, **kwargs):
+        out, err = self.run_bzr(('whoami',) + cmd_args, **kwargs)
+        self.assertEquals('', err)
+        lines = out.splitlines()
+        self.assertLength(1, lines)
+        self.assertEquals(expected, lines[0].rstrip())
+
+    def test_whoami_no_args_no_conf(self):
         # this should always identify something, if only "john at localhost"
         out = self.run_bzr("whoami")[0]
         self.assertTrue(len(out) > 0)
         self.assertEquals(1, out.count('@'))
 
+    def test_whoami_email_no_args(self):
         out = self.run_bzr("whoami --email")[0]
         self.assertTrue(len(out) > 0)
         self.assertEquals(1, out.count('@'))
@@ -47,29 +55,22 @@
         b = bzrlib.branch.Branch.open('.')
         b.get_config().set_user_option('email',
                                        'Branch Identity <branch at identi.ty>')
-        whoami = self.run_bzr("whoami")[0]
-        self.assertEquals('Branch Identity <branch at identi.ty>\n', whoami)
-        whoami_email = self.run_bzr("whoami --email")[0]
-        self.assertEquals('branch at identi.ty\n', whoami_email)
+        self.assertWhoAmI('Branch Identity <branch at identi.ty>')
+        self.assertWhoAmI('branch at identi.ty', '--email')
 
         # Verify that the environment variable overrides the value
         # in the file
         self.overrideEnv('BZR_EMAIL', 'Different ID <other at environ.ment>')
-        whoami = self.run_bzr("whoami")[0]
-        self.assertEquals('Different ID <other at environ.ment>\n', whoami)
-        whoami_email = self.run_bzr("whoami --email")[0]
-        self.assertEquals('other at environ.ment\n', whoami_email)
+        self.assertWhoAmI('Different ID <other at environ.ment>')
+        self.assertWhoAmI('other at environ.ment', '--email')
 
     def test_whoami_utf8(self):
         """verify that an identity can be in utf-8."""
-        wt = self.make_branch_and_tree('.')
         self.run_bzr(['whoami', u'Branch Identity \u20ac <branch at identi.ty>'],
                      encoding='utf-8')
-        whoami = self.run_bzr("whoami", encoding='utf-8')[0]
-        self.assertEquals('Branch Identity \xe2\x82\xac ' +
-                          '<branch at identi.ty>\n', whoami)
-        whoami_email = self.run_bzr("whoami --email", encoding='utf-8')[0]
-        self.assertEquals('branch at identi.ty\n', whoami_email)
+        self.assertWhoAmI('Branch Identity \xe2\x82\xac <branch at identi.ty>',
+                          encoding='utf-8')
+        self.assertWhoAmI('branch at identi.ty', '--email')
 
     def test_whoami_ascii(self):
         """
@@ -80,10 +81,10 @@
         b = bzrlib.branch.Branch.open('.')
         b.get_config().set_user_option('email', u'Branch Identity \u20ac ' +
                                        '<branch at identi.ty>')
-        whoami = self.run_bzr("whoami", encoding='ascii')[0]
-        self.assertEquals('Branch Identity ? <branch at identi.ty>\n', whoami)
-        whoami_email = self.run_bzr("whoami --email", encoding='ascii')[0]
-        self.assertEquals('branch at identi.ty\n', whoami_email)
+        self.assertWhoAmI('Branch Identity ? <branch at identi.ty>',
+                          encoding='ascii')
+        self.assertWhoAmI('branch at identi.ty', '--email',
+                          encoding='ascii')
 
     def test_warning(self):
         """verify that a warning is displayed if no email is given."""
@@ -109,10 +110,11 @@
         wt = self.make_branch_and_tree('subdir')
         c = wt.branch.get_config()
         c.set_user_option('email', 'Branch Identity <branch at identi.ty>')
-        out, err = self.run_bzr("whoami --directory subdir")
-        self.assertEquals('Branch Identity <branch at identi.ty>\n', out)
+        self.assertWhoAmI('Branch Identity <branch at identi.ty>',
+                          '--directory', 'subdir')
         self.run_bzr(['whoami', '--directory', 'subdir', '--branch',
                       'Changed Identity <changed at identi.ty>'])
+        c = wt.branch.get_config()
         self.assertEquals('Changed Identity <changed at identi.ty>',
                           c.get_user_option('email'))
 
@@ -122,13 +124,14 @@
         c = wt.branch.get_config()
         c.set_user_option('email', 'Branch Identity <branch at identi.ty>')
         url = self.get_readonly_url() + '/subdir'
-        out, err = self.run_bzr(['whoami', '--directory', url])
-        self.assertEquals('Branch Identity <branch at identi.ty>\n', out)
+        self.assertWhoAmI('Branch Identity <branch at identi.ty>',
+                          '--directory', url)
         url = self.get_url('subdir')
         self.run_bzr(['whoami', '--directory', url, '--branch',
                       'Changed Identity <changed at identi.ty>'])
         # The identity has been set in the branch config (but not the global
         # config)
+        c = wt.branch.get_config()
         self.assertEquals('Changed Identity <changed at identi.ty>',
                           c.get_user_option('email'))
         global_conf = config.GlobalConfig()