Changeset 12716

Timestamp:

Apr 21, 2014, 3:46:24 AM (11 years ago)

Author:

Jun Omae

Message:

1.1.2dev: merged [12715] from 1.0-stable (a part of #11505)

Location:

trunk

Files:

• . (modified) (1 prop)
• tracopt/versioncontrol/svn/tests/svn_fs.py (modified) (3 diffs)

trunk/tracopt/versioncontrol/svn/tests/svn_fs.py

@@ -37 +37 @@
 from trac.util.concurrency import get_thread_id
 from trac.util.datefmt import utc
-from trac.versioncontrol import DbRepositoryProvider, Changeset, Node, \
-                                NoSuchChangeset
+from trac.versioncontrol.api import DbRepositoryProvider, Changeset, Node, \
+                                    NoSuchChangeset, RepositoryManager
 from tracopt.versioncontrol.svn import svn_fs
 
@@ -1025 +1025 @@
 
     def tearDown(self):
+        self.repos.close()
+        self.repos = None
+        # clear cached repositories to avoid TypeError on termination (#11505)
+        RepositoryManager(self.env).reload_repositories()
         self.env.reset_db()
         # needed to avoid issue with 'WindowsError: The process cannot access
@@ -1047 +1051 @@
         self.repos.close()
         self.repos = None
+        # clear cached repositories to avoid TypeError on termination (#11505)
+        RepositoryManager(self.env).reload_repositories()