Rev 6552: Restore safety net home check lost some time ago. in file:///home/vila/src/bzr/cleanup/restore-safety-net-home-check/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/restore-safety-net-home-check/

------------------------------------------------------------
revno: 6552
revision-id: v.ladeuil+lp at free.fr-20120803080445-6bias0ydlnmzky2d
parent: pqm at pqm.ubuntu.com-20120802151743-ht3zipt6g7dgmk2v
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: restore-safety-net-home-check
timestamp: Fri 2012-08-03 10:04:45 +0200
message:
  Restore safety net home check lost some time ago.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2012-06-18 11:43:07 +0000
+++ b/bzrlib/tests/__init__.py	2012-08-03 08:04:45 +0000
@@ -2595,13 +2595,16 @@
         real branch.
         """
         root = TestCaseWithMemoryTransport.TEST_ROOT
-        # Make sure we get a readable and accessible home for .bzr.log
-        # and/or config files, and not fallback to weird defaults (see
-        # http://pad.lv/825027).
-        self.assertIs(None, os.environ.get('BZR_HOME', None))
-        os.environ['BZR_HOME'] = root
-        wt = controldir.ControlDir.create_standalone_workingtree(root)
-        del os.environ['BZR_HOME']
+        try:
+            # Make sure we get a readable and accessible home for .bzr.log
+            # and/or config files, and not fallback to weird defaults (see
+            # http://pad.lv/825027).
+            self.assertIs(None, os.environ.get('BZR_HOME', None))
+            os.environ['BZR_HOME'] = root
+            wt = controldir.ControlDir.create_standalone_workingtree(root)
+            del os.environ['BZR_HOME']
+        except Exception, e:
+            self.fail("Fail to initialize the safety net: %r\nExiting\n" % (e,)
         # Hack for speed: remember the raw bytes of the dirstate file so that
         # we don't need to re-open the wt to check it hasn't changed.
         TestCaseWithMemoryTransport._SAFETY_NET_PRISTINE_DIRSTATE = (