Fix a bug in FilenameUniqDict that led to test failures.

sphinx/util/__init__.py

@@ -307,7 +307,7 @@ class FilenameUniqDict(dict):
     def add_file(self, docname, newfile):
         if newfile in self:
             self[newfile][0].add(docname)
-            return
+            return self[newfile][1]
         uniquename = path.basename(newfile)
         base, ext = path.splitext(uniquename)
         i = 0
@@ -321,8 +321,9 @@ class FilenameUniqDict(dict):
     def purge_doc(self, docname):
         for filename, (docs, _) in self.items():
             docs.discard(docname)
-            if not docs:
+            #if not docs:
-                del self[filename]
+            #    del self[filename]
+            #    self._existing.discard(filename)
 
     def __getstate__(self):
         return self._existing

tests/test_build.py

@@ -30,6 +30,10 @@ from sphinx.builders.latex import LaTeXBuilder
 from sphinx.writers.latex import LaTeXTranslator
 
 
+def teardown_module():
+    (test_root / '_build').rmtree()
+
+
 html_warnfile = StringIO()
 latex_warnfile = StringIO()
 

tests/util.py

@@ -159,10 +159,9 @@ def with_app(*args, **kwargs):
         @wraps(func)
         def deco(*args2, **kwargs2):
             app = TestApp(*args, **kwargs)
-            try:
+            func(app, *args2, **kwargs2)
-                return func(app, *args2, **kwargs2)
+            # don't execute cleanup if test failed
-            finally:
+            app.cleanup()
-                app.cleanup()
         return deco
     return generator
 
@@ -176,11 +175,10 @@ def gen_with_app(*args, **kwargs):
         @wraps(func)
         def deco(*args2, **kwargs2):
             app = TestApp(*args, **kwargs)
-            try:
+            for item in func(app, *args2, **kwargs2):
-                for item in func(app, *args2, **kwargs2):
+                yield item
-                    yield item
+            # don't execute cleanup if test failed
-            finally:
+            app.cleanup()
-                app.cleanup()
         return deco
     return generator