Changeset 12775

Timestamp:

May 11, 2014, 4:45:34 PM (11 years ago)

Author:

Jun Omae

Message:

1.1.2dev: merged [12774] from 1.0-stable (fix for #11505)

Location:

trunk

Files:

• . (modified) (1 prop)
• tracopt/versioncontrol/git/PyGIT.py (modified) (2 diffs)
• tracopt/versioncontrol/git/tests/PyGIT.py (modified) (2 diffs)
• tracopt/versioncontrol/git/tests/git_fs.py (modified) (2 diffs)

trunk/tracopt/versioncontrol/git/PyGIT.py

@@ -224 +224 @@
         return self.__inst
 
+    @classmethod
+    def _clean(cls):
+        """For testing purpose only"""
+        with StorageFactory.__dict_lock:
+            cls.__dict.clear()
+            cls.__dict_nonweak.clear()
+
 
 class Storage(object):
@@ -229 +236 @@
 
     __SREV_MIN = 4 # minimum short-rev length
-
 
     class RevCache(tuple):

trunk/tracopt/versioncontrol/git/tests/PyGIT.py

@@ -22 +22 @@
 from trac.util import create_file
 from trac.util.compat import close_fds
-from trac.versioncontrol.api import Changeset, DbRepositoryProvider
+from trac.versioncontrol.api import Changeset, DbRepositoryProvider, \
+                                    RepositoryManager
 from tracopt.versioncontrol.git.git_fs import GitConnector
 from tracopt.versioncontrol.git.PyGIT import GitCore, GitError, Storage, \
@@ -166 +167 @@
 
     def tearDown(self):
+        RepositoryManager(self.env).reload_repositories()
+        StorageFactory._clean()
         self.env.reset_db()
         if os.path.isdir(self.repos_path):

trunk/tracopt/versioncontrol/git/tests/git_fs.py

@@ -29 +29 @@
 from trac.versioncontrol.web_ui.log import LogModule
 from trac.web.href import Href
+from tracopt.versioncontrol.git.PyGIT import StorageFactory
 from tracopt.versioncontrol.git.git_fs import GitConnector
 
@@ -52 +53 @@
 
     def tearDown(self):
+        self._repomgr.reload_repositories()
+        StorageFactory._clean()
         self.env.reset_db()
         if os.path.isdir(self.repos_path):