Rev 5985: Some cleanup and a first try at fixing bug #798698. in file:///home/vila/src/bzr/bugs/bogus-log-files/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5985
revision-id: v.ladeuil+lp at free.fr-20110617134001-0xzuhf6amdgoc4a1
parent: pqm at pqm.ubuntu.com-20110616233147-l57xwon6dzb6waze
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bogus-log-files
timestamp: Fri 2011-06-17 15:40:01 +0200
message:
  Some cleanup and a first try at fixing bug #798698.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-06-16 19:00:24 +0000
+++ b/bzrlib/tests/__init__.py	2011-06-17 13:40:01 +0000
@@ -1704,7 +1704,7 @@
     def _finishLogFile(self):
         """Finished with the log file.
 
-        Close the file and delete it, unless setKeepLogfile was called.
+        Close the file and delete it.
         """
         if trace._trace_file:
             # flush the log file, to get all content

=== modified file 'bzrlib/tests/blackbox/test_exceptions.py'
--- a/bzrlib/tests/blackbox/test_exceptions.py	2011-06-02 09:21:46 +0000
+++ b/bzrlib/tests/blackbox/test_exceptions.py	2011-06-17 13:40:01 +0000
@@ -30,10 +30,8 @@
     )
 from bzrlib.repofmt.groupcompress_repo import RepositoryFormat2a
 
-from bzrlib.tests import TestCase
-
-
-class TestExceptionReporting(TestCase):
+
+class TestExceptionReporting(tests.TestCaseInTempDir):
 
     def test_exception_exitcode(self):
         # we must use a subprocess, because the normal in-memory mechanism

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2011-06-16 21:23:44 +0000
+++ b/bzrlib/tests/test_selftest.py	2011-06-17 13:40:01 +0000
@@ -2505,13 +2505,19 @@
     """A simple exception which just allows us to skip unnecessary steps"""
 
 
-class TestStartBzrSubProcess(tests.TestCase):
+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 _popen(self, *args, **kwargs):
-        """Record the command that is run, so that we can ensure it is correct"""
+        """Override the base version to record the command that is run.
+
+        From there we can ensure it is correct without spawning a real process.
+        """
         self.check_popen_state()
         self._popen_args = args
         self._popen_kwargs = kwargs
@@ -2526,7 +2532,7 @@
 
     def test_allow_plugins(self):
         self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
-            allow_plugins=True)
+                          allow_plugins=True)
         command = self._popen_args[0]
         self.assertEqual([], command[2:])
 
@@ -2537,7 +2543,7 @@
             self.assertEqual('set variable', os.environ['EXISTANT_ENV_VAR'])
         self.check_popen_state = check_environment
         self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
-            env_changes={'EXISTANT_ENV_VAR':'set variable'})
+                          env_changes={'EXISTANT_ENV_VAR':'set variable'})
         # not set in theparent
         self.assertFalse('EXISTANT_ENV_VAR' in os.environ)
 
@@ -2549,7 +2555,7 @@
         os.environ['EXISTANT_ENV_VAR'] = 'set variable'
         self.check_popen_state = check_environment
         self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
-            env_changes={'EXISTANT_ENV_VAR':None})
+                          env_changes={'EXISTANT_ENV_VAR':None})
         # Still set in parent
         self.assertEqual('set variable', os.environ['EXISTANT_ENV_VAR'])
         del os.environ['EXISTANT_ENV_VAR']
@@ -2560,7 +2566,7 @@
             self.assertFalse('NON_EXISTANT_ENV_VAR' in os.environ)
         self.check_popen_state = check_environment
         self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
-            env_changes={'NON_EXISTANT_ENV_VAR':None})
+                          env_changes={'NON_EXISTANT_ENV_VAR':None})
 
     def test_working_dir(self):
         """Test that we can specify the working dir for the child"""
@@ -2569,18 +2575,12 @@
         chdirs = []
         def chdir(path):
             chdirs.append(path)
-        os.chdir = chdir
-        try:
-            def getcwd():
-                return 'current'
-            osutils.getcwd = getcwd
-            try:
-                self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
-                    working_dir='foo')
-            finally:
-                osutils.getcwd = orig_getcwd
-        finally:
-            os.chdir = orig_chdir
+        self.overrideAttr(os, 'chdir', chdir)
+        def getcwd():
+            return 'current'
+        self.overrideAttr(osutils, 'getcwd', getcwd)
+        self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
+                          working_dir='foo')
         self.assertEqual(['foo', 'current'], chdirs)
 
     def test_get_bzr_path_with_cwd_bzrlib(self):