Merge lp:~spiv/bzr/test-isolation-speed into lp:bzr

[Andrew Bennetts]

Speed up TestCaseWithMemoryTransport._check_safety_net by reading the dirstate file directly rather than using WorkingTree.open().

This hack reduces the total time for the test suite to run on my laptop by perhaps 10%. It replaces the WorkingTree.open(root).last_revision() == 'null:' check in _check_safety_net with just comparing the raw bytes of the dirstate file to their pristine state.

[Martin Pool (mbp)]

cute

in theory we should see this show up in the babune graphs after it lands

[Andrew Bennetts (spiv)]

sent to pqm by email

[lp:~spiv/bzr/test-isolation-speed]

6019. By Andrew Bennetts on 2011-07-11

Merge lp:bzr/2.4.

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2011-06-27 15:42:09 +0000
+++ bzrlib/tests/__init__.py	2011-07-11 02:09:17 +0000
@@ -2505,7 +2505,11 @@
         real branch.
         """
         root = TestCaseWithMemoryTransport.TEST_ROOT
-        bzrdir.BzrDir.create_standalone_workingtree(root)
+        wt = bzrdir.BzrDir.create_standalone_workingtree(root)
+        # 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 = (
+            wt.control_transport.get_bytes('dirstate'))
 
     def _check_safety_net(self):
         """Check that the safety .bzr directory have not been touched.
@@ -2514,10 +2518,10 @@
         propagating. This method ensures than a test did not leaked.
         """
         root = TestCaseWithMemoryTransport.TEST_ROOT
-        self.permit_url(_mod_transport.get_transport(root).base)
-        wt = workingtree.WorkingTree.open(root)
-        last_rev = wt.last_revision()
-        if last_rev != 'null:':
+        t = _mod_transport.get_transport(root)
+        self.permit_url(t.base)
+        if (t.get_bytes('.bzr/checkout/dirstate') != 
+                TestCaseWithMemoryTransport._SAFETY_NET_PRISTINE_DIRSTATE):
             # The current test have modified the /bzr directory, we need to
             # recreate a new one or all the followng tests will fail.
             # If you need to inspect its content uncomment the following line

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt	2011-07-08 07:41:36 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-07-11 02:09:17 +0000
@@ -63,6 +63,12 @@
   due to the order that `build_snapshot` performs its actions.
   (Andrew Bennetts)
 
+* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
+  just compares the bytes in the dirstate file to its pristine state,
+  rather than opening the WorkingTree and calling ``last_revision()``.
+  This reduces the overall test suite time by about 10% on my laptop.
+  (Andrew Bennetts)
+
 
 bzr 2.4b5
 #########