Rev 2887: Fix #147986 by monitoring a safety .bzr directory. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Oct 4 18:48:14 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2887
revision-id: pqm at pqm.ubuntu.com-20071004174812-z1zg35r1vssltydl
parent: pqm at pqm.ubuntu.com-20071004163827-t91s0epirx172rab
parent: v.ladeuil+lp at free.fr-20071004171053-rxtb0dwigygsany3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-10-04 18:48:12 +0100
message:
Fix #147986 by monitoring a safety .bzr directory.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 2885.1.2
merged: v.ladeuil+lp at free.fr-20071004171053-rxtb0dwigygsany3
parent: v.ladeuil+lp at free.fr-20071004154844-6an068lo9akzt2oh
parent: v.ladeuil+lp at free.fr-20071002112453-sv4e5n6d5d3t6fb6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2007-10-04 19:10:53 +0200
message:
Fix #147986 by monitoring a safety .bzr directory.
------------------------------------------------------------
revno: 2875.1.2
merged: v.ladeuil+lp at free.fr-20071002112453-sv4e5n6d5d3t6fb6
parent: v.ladeuil+lp at free.fr-20071002112144-et1xbsdbof2y9urw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 147986
timestamp: Tue 2007-10-02 13:24:53 +0200
message:
Update NEWS, fix typo.
------------------------------------------------------------
revno: 2875.1.1
merged: v.ladeuil+lp at free.fr-20071002112144-et1xbsdbof2y9urw
parent: pqm at pqm.ubuntu.com-20071002082143-hkducdw42q0cel4l
parent: v.ladeuil+lp at free.fr-20070913152049-aeo7iwaln0fusp33
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 147986
timestamp: Tue 2007-10-02 13:21:44 +0200
message:
Fix #147986 by monitoring a safety .bzr directory.
* bzrlib/tests/test_selftest.py:
(TestTestCaseWithMemoryTransport.test_safety_net): Accompanying
test.
* bzrlib/tests/__init__.py:
(ExtendedTestResult): Old error, never detected before.
(TestCaseWithMemoryTransport._create_safety_net): New method
explicitely creating a safety net to protect higher .bzr
directories from being polluted by tests.
(TestCaseWithMemoryTransport._check_safety_net): New method
checking that a test did not modify the safety net and re-create a
virgin safety net if it has modified it.
------------------------------------------------------------
revno: 2817.5.1
merged: v.ladeuil+lp at free.fr-20070913152049-aeo7iwaln0fusp33
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: scratch
timestamp: Thu 2007-09-13 17:20:49 +0200
message:
Catch leaking tests.
* bzrlib/tests/__init__.py:
(ExtendedTestResult._addSkipped): Fix typo __exc__info does not
exists. Why this has went unnoticed so long is a bit of a mistery.
(TestCaseWithMemoryTransport._create_safety_net): Isolated for
reuse.
(TestCaseWithMemoryTransport._check_safety_net): Basic test that
the test did not use the scratch .bzr directory.
(TestCaseWithMemoryTransport._make_test_root): Ensures that the
bzr scratch directory stays intact.
=== modified file 'NEWS'
--- a/NEWS 2007-10-04 15:35:37 +0000
+++ b/NEWS 2007-10-04 17:10:53 +0000
@@ -110,6 +110,10 @@
will remain opened.
(Vincent Ladeuil, #140055)
+ * Monitor the .bzr directory created in the top level test
+ directory to detect leaking tests.
+ (Vincent Ladeuil, #147986)
+
* The basename, not the full path, is now used when checking whether
the profiling dump file begins with ``callgrind.out`` or not. This
fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2007-10-04 05:50:44 +0000
+++ b/bzrlib/tests/__init__.py 2007-10-04 17:10:53 +0000
@@ -161,7 +161,7 @@
class ExtendedTestResult(unittest._TextTestResult):
"""Accepts, reports and accumulates the results of running tests.
- Compared to this unittest version this class adds support for
+ Compared to the unittest version this class adds support for
profiling, benchmarking, stopping as soon as a test fails, and
skipping tests. There are further-specialized subclasses for
different types of display.
@@ -342,7 +342,7 @@
except KeyboardInterrupt:
raise
except:
- self.addError(test, test.__exc_info())
+ self.addError(test, test._exc_info())
else:
# seems best to treat this as success from point-of-view of unittest
# -- it actually does nothing so it barely matters :)
@@ -1835,19 +1835,45 @@
base = self.get_vfs_only_server().get_url()
return self._adjust_url(base, relpath)
+ def _create_safety_net(self):
+ """Make a fake bzr directory.
+
+ This prevents any tests propagating up onto the TEST_ROOT directory's
+ real branch.
+ """
+ root = TestCaseWithMemoryTransport.TEST_ROOT
+ bzrdir.BzrDir.create_standalone_workingtree(root)
+
+ def _check_safety_net(self):
+ """Check that the safety .bzr directory have not been touched.
+
+ _make_test_root have created a .bzr directory to prevent tests from
+ propagating. This method ensures than a test did not leaked.
+ """
+ root = TestCaseWithMemoryTransport.TEST_ROOT
+ wt = workingtree.WorkingTree.open(root)
+ last_rev = wt.last_revision()
+ if last_rev != 'null:':
+ # 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
+ # import pdb; pdb.set_trace()
+ _rmtree_temp_dir(root + '/.bzr')
+ self._create_safety_net()
+ raise AssertionError('%s/.bzr should not be modified' % root)
+
def _make_test_root(self):
- if TestCaseWithMemoryTransport.TEST_ROOT is not None:
- return
- root = osutils.mkdtemp(prefix='testbzr-', suffix='.tmp')
- TestCaseWithMemoryTransport.TEST_ROOT = root
-
- # make a fake bzr directory there to prevent any tests propagating
- # up onto the source directory's real branch
- bzrdir.BzrDir.create_standalone_workingtree(root)
-
- # The same directory is used by all tests, and we're not specifically
- # told when all tests are finished. This will do.
- atexit.register(_rmtree_temp_dir, root)
+ if TestCaseWithMemoryTransport.TEST_ROOT is None:
+ root = osutils.mkdtemp(prefix='testbzr-', suffix='.tmp')
+ TestCaseWithMemoryTransport.TEST_ROOT = root
+
+ self._create_safety_net()
+
+ # The same directory is used by all tests, and we're not
+ # specifically told when all tests are finished. This will do.
+ atexit.register(_rmtree_temp_dir, root)
+
+ self.addCleanup(self._check_safety_net)
def makeAndChdirToTestDir(self):
"""Create a temporary directories for this one test.
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2007-10-02 06:13:56 +0000
+++ b/bzrlib/tests/test_selftest.py 2007-10-02 11:24:53 +0000
@@ -613,6 +613,19 @@
self.assertEqual(format.repository_format.__class__,
tree.branch.repository._format.__class__)
+ def test_safety_net(self):
+ """No test should modify the safety .bzr directory.
+
+ We just test that the _check_safety_net private method raises
+ AssertionError, it's easier than building a test suite with the same
+ test.
+ """
+ # Oops, a commit in the current directory (i.e. without local .bzr
+ # directory) will crawl up the hierarchy to find a .bzr directory.
+ self.run_bzr(['commit', '-mfoo', '--unchanged'])
+ # But we have a safety net in place.
+ self.assertRaises(AssertionError, self._check_safety_net)
+
class TestTestCaseWithTransport(TestCaseWithTransport):
"""Tests for the convenience functions TestCaseWithTransport introduces."""
More information about the bazaar-commits
mailing list