Rev 6424: Mwhahaha. You cannot get None for email not being set in bazaar.conf. On the other hand, a test raising NoWhoami was missing here ; ) in file:///home/vila/src/bzr/experimental/more-branch-config-options/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/more-branch-config-options/

------------------------------------------------------------
revno: 6424
revision-id: v.ladeuil+lp at free.fr-20120105134316-7vii2cb1onbuzydb
parent: v.ladeuil+lp at free.fr-20120105091734-4ncoo2gg7wbowo2q
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: more-branch-config-options
timestamp: Thu 2012-01-05 14:43:16 +0100
message:
  Mwhahaha. You cannot get None for email not being set in bazaar.conf. On the other hand, a test raising NoWhoami was missing here ;)
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_whoami.py'
--- a/bzrlib/tests/blackbox/test_whoami.py	2012-01-04 17:12:42 +0000
+++ b/bzrlib/tests/blackbox/test_whoami.py	2012-01-05 13:43:16 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009-2012 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 import bzrlib
 from bzrlib import (
     config,
+    errors,
     tests,
     )
 
@@ -139,7 +140,7 @@
         self.overrideEnv('EMAIL', None)
         self.overrideAttr(config, '_auto_user_id', lambda: (None, None))
         global_conf = config.GlobalStack()
-        self.assertEquals(None, global_conf.get('email'))
+        self.assertRaises(errors.NoWhoami, global_conf.get, 'email')
 
     def test_whoami_nonbranch_directory(self):
         """Test --directory mentioning a non-branch directory."""