Fix flaky test: Increment request count before responding

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 9676e286aaae11eb1959cb5868af85e6f3681d25..a0aeb21a889b6b3bab97f23ad8d374a12d37c46b 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -5,50 +5,110 @@
 # Free Software Foundation, version 3.
 
 
+from abc import ABC, abstractmethod
 import unittest
 import io
 import subprocess
+
 import paperdoorknob
+
 from testing.fakeserver import FakeGlowficServer
-from fetch import DirectFetcher
+from domfilter import ApplyDOMFilters
+from fetch import DirectFetcher, FakeFetcher, Fetcher
+from glowfic import ContentOnlyLayout, BelowIconLayout
+from images import FakeImageStore
+from spec import Spec
+from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
 TIMEOUT = 8
 
 
-class TestPaperDoorknob(unittest.TestCase):
-    def setUp(self) -> None:
-        self._server = self.enterContext(FakeGlowficServer())
-        self._port = self._server.port()
+class BaseTestProcess(ABC):
 
-    def testReplies(self) -> None:
-        with DirectFetcher(TIMEOUT) as f:
-            replies = paperdoorknob.replies(
-                paperdoorknob.clean(
-                    paperdoorknob.parse(
-                        f.fetch(f"http://localhost:{self._port}"))))
-            self.assertEqual([r.text.strip() for r in replies],
-                             ["This is glowfic", "You sure?", "Pretty sure."])
+    @abstractmethod
+    def url(self) -> str:
+        raise NotImplementedError()
+
+    @abstractmethod
+    def fetcher(self) -> Fetcher:
+        raise NotImplementedError()
 
     def testProcess(self) -> None:
-        with DirectFetcher(TIMEOUT) as f:
-            buf = io.BytesIO()
-            paperdoorknob.process(
-                f"http://localhost:{self._port}", f, buf, 'pandoc')
-            self.assertEqual(buf.getvalue(), b'''\\documentclass{article}
+        buf = io.BytesIO()
+        spec = Spec(
+            self.url(),
+            self.fetcher(),
+            FakeImageStore(),
+            lambda x: x,
+            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+            ContentOnlyLayout(PandocTexifier('pandoc')),
+            'margin=20mm',
+            buf)
+        paperdoorknob.process(spec)
+        assert buf.getvalue() == b'''\\documentclass{article}
+\\usepackage{graphicx}
+\\usepackage{wrapfig}
+\\usepackage[margin=20mm]{geometry}
 \\begin{document}
 This is glowfic
 You \\emph{sure}?
 Pretty sure.
 \\end{document}
-''')
+'''
+
+    def testDirectTexifier(self) -> None:
+        texifier = VerifyingTexifier(
+            PandocTexifier('pandoc'), DirectTexifier())
+        buf = io.BytesIO()
+        spec = Spec(
+            self.url(),
+            self.fetcher(),
+            FakeImageStore(),
+            lambda x: x,
+            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+            ContentOnlyLayout(texifier),
+            None,
+            buf)
+        paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
-        with DirectFetcher(TIMEOUT) as f:
-            with open("test.tex", 'wb') as out:
-                paperdoorknob.process(
-                    f"http://localhost:{self._port}", f, out, 'pandoc')
-            subprocess.run(['pdflatex', 'test.tex'],
-                           stdin=subprocess.DEVNULL, check=True)
+        with open("test.tex", 'wb') as out:
+            spec = Spec(
+                self.url(),
+                self.fetcher(),
+                FakeImageStore(),
+                lambda x: x,
+                lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
+                BelowIconLayout(PandocTexifier('pandoc'), 20),
+                None,
+                out)
+            paperdoorknob.process(spec)
+        subprocess.run(['pdflatex', 'test.tex'],
+                       stdin=subprocess.DEVNULL, check=True)
+
+
+class TestProcessFromWebserver(BaseTestProcess, unittest.TestCase):
+
+    def setUp(self) -> None:
+        self._fetcher = self.enterContext(DirectFetcher(TIMEOUT))
+        self._server = self.enterContext(FakeGlowficServer())
+        self._port = self._server.port()
+
+    def url(self) -> str:
+        return f"http://localhost:{self._port}"
+
+    def fetcher(self) -> Fetcher:
+        return self._fetcher
+
+
+class TestProcessFromFakeFetcher(BaseTestProcess, unittest.TestCase):
+
+    def url(self) -> str:
+        return 'fic'
+
+    def fetcher(self) -> Fetcher:
+        with open('testdata/this-is-glowfic.html', 'rb') as f:
+            return FakeFetcher({'fic': f.read(9999)})
 
 
 if __name__ == '__main__':