Rev 6210: (jelmer) Don't require global_state to be initialized to use bzrlib's in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6210 [merge]
revision-id: pqm at pqm.ubuntu.com-20111012210410-y1vdq7fhuhqlk61x
parent: pqm at pqm.ubuntu.com-20111012160013-wkxrrcfib74vqm7m
parent: jelmer at samba.org-20111012203201-aak1tseg3gnkecry
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-10-12 21:04:10 +0000
message:
  (jelmer) Don't require global_state to be initialized to use bzrlib's
   TestCase. (Jelmer Vernooij)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-10-12 16:00:13 +0000
+++ b/bzrlib/tests/__init__.py	2011-10-12 20:32:01 +0000
@@ -997,8 +997,9 @@
         for feature in getattr(self, '_test_needs_features', []):
             self.requireFeature(feature)
         self._cleanEnvironment()
-        self.overrideAttr(bzrlib.global_state, 'cmdline_overrides',
-                          config.CommandLineSection())
+        if bzrlib.global_state is not None:
+            self.overrideAttr(bzrlib.global_state, 'cmdline_overrides',
+                              config.CommandLineSection())
         self._silenceUI()
         self._startLogFile()
         self._benchcalls = []