Rev 5986: Really fix it. in file:///home/vila/src/bzr/bugs/798698-bogus-log-files/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/798698-bogus-log-files/

------------------------------------------------------------
revno: 5986
revision-id: v.ladeuil+lp at free.fr-20110617135359-nxed91ijteuny13v
parent: v.ladeuil+lp at free.fr-20110617134001-0xzuhf6amdgoc4a1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 798698-bogus-log-files
timestamp: Fri 2011-06-17 15:53:59 +0200
message:
  Really fix it.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_exceptions.py'
--- a/bzrlib/tests/blackbox/test_exceptions.py	2011-06-17 13:40:01 +0000
+++ b/bzrlib/tests/blackbox/test_exceptions.py	2011-06-17 13:53:59 +0000
@@ -61,7 +61,7 @@
         self.assertEquals(out, "")
 
 
-class TestOptParseBugHandling(TestCase):
+class TestOptParseBugHandling(tests.TestCase):
     "Test that we handle http://bugs.python.org/issue2931"
 
     def test_nonascii_optparse(self):

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2011-06-17 13:40:01 +0000
+++ b/bzrlib/tests/test_selftest.py	2011-06-17 13:53:59 +0000
@@ -2508,10 +2508,8 @@
 class TestStartBzrSubProcess(tests.TestCaseInTempDir):
     """Stub test start_bzr_subprocess."""
 
-
-    def check_popen_state(self):
-        """Replace to make assertions when popen is called."""
-        raise AssertionError('check_popen_state should be overriden')
+    def _subprocess_log_cleanup(self):
+        """Inhibits the base version as we don't produce a log file."""
 
     def _popen(self, *args, **kwargs):
         """Override the base version to record the command that is run.
@@ -2523,6 +2521,9 @@
         self._popen_kwargs = kwargs
         raise _DontSpawnProcess()
 
+    def check_popen_state(self):
+        """Replace to make assertions when popen is called."""
+
     def test_run_bzr_subprocess_no_plugins(self):
         self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [])
         command = self._popen_args[0]