Rev 3148: Review feedback. Fix variable names and scope. in file:///v/home/vila/src/bzr/experimental/selftest/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/experimental/selftest/

------------------------------------------------------------
revno: 3148
revision-id:v.ladeuil+lp at free.fr-20080107164531-6qm2hwnnkoipth60
parent: v.ladeuil+lp at free.fr-20071229120125-1vf2l1w7x8y3pw9i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest
timestamp: Mon 2008-01-07 17:45:31 +0100
message:
  Review feedback. Fix variable names and scope.
modified:
  bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
-------------- next part --------------
=== modified file 'bzrlib/tests/TestUtil.py'
--- a/bzrlib/tests/TestUtil.py	2007-12-29 12:01:25 +0000
+++ b/bzrlib/tests/TestUtil.py	2008-01-07 16:45:31 +0000
@@ -73,14 +73,12 @@
         visitTests(self, visitor)
 
 
-# Memoize test names
-test_func_names = {}
-
-
 class TestLoader(unittest.TestLoader):
     """Custom TestLoader to extend the stock python one."""
 
     suiteClass = TestSuite
+    # Memoize test names by test class dict
+    test_func_names = {}
 
     def loadTestsFromModuleNames(self, names):
         """use a custom means to load tests from modules.
@@ -126,15 +124,16 @@
         else:
             return basic_tests
 
-    def getTestCaseNames(self, testCaseClass):
-        testFnNames = test_func_names.get(testCaseClass, None)
-        if testFnNames is not None:
+    def getTestCaseNames(self, test_case_class):
+        test_fn_names = self.test_func_names.get(test_case_class, None)
+        if test_fn_names is not None:
             # We already calculate that
-            return testFnNames
+            return test_fn_names
 
-        testFnNames = unittest.TestLoader.getTestCaseNames(self, testCaseClass)
-        test_func_names[testCaseClass] = testFnNames
-        return testFnNames
+        test_fn_names = unittest.TestLoader.getTestCaseNames(self,
+                                                             test_case_class)
+        self.test_func_names[test_case_class] = test_fn_names
+        return test_fn_names
 
 def _load_module_by_name(mod_name):
     parts = mod_name.split('.')