Mercurial > piecrust2

diff tests/test_pipelines_page.py @ 979:45ad976712ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: Big push to get the tests to pass again. - Lots of fixes everywhere in the code. - Try to handle debug logging in the multiprocessing worker pool when running in pytest. Not perfect, but usable for now. - Replace all `.md` test files with `.html` since now a auto-format extension always sets the format. - Replace `out` with `outfiles` in most places since now blog archives are added to the bake output and I don't want to add expected outputs for blog archives everywhere.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 29 Oct 2017 22:51:57 -0700
parents 72f17534d58e
children
line wrap: on
line diff
--- a/tests/test_pipelines_page.py	Sun Oct 29 22:46:41 2017 -0700
+++ b/tests/test_pipelines_page.py	Sun Oct 29 22:51:57 2017 -0700
@@ -3,7 +3,7 @@
 import urllib.parse
 import pytest
 from piecrust.pipelines.records import MultiRecord
-from piecrust.pipelines._pagebaker import PageBaker
+from piecrust.pipelines._pagebaker import get_output_path
 from .mockutil import get_mock_app, mock_fs, mock_fs_scope
 
 
@@ -41,17 +41,16 @@
         app.config.set('site/pretty_urls', True)
     assert app.config.get('site/pretty_urls') == pretty
 
+    out_dir = '/destination'
+
     for site_root in ['/', '/whatever/', '/~johndoe/']:
         app.config.set('site/root', urllib.parse.quote(site_root))
-        baker = PageBaker(app, '/destination')
-        try:
-            path = baker.getOutputPath(urllib.parse.quote(site_root) + uri,
-                                       pretty)
-            expected = os.path.normpath(
-                os.path.join('/destination', expected))
-            assert expected == path
-        finally:
-            baker.shutdown()
+        path = get_output_path(app, out_dir,
+                               urllib.parse.quote(site_root) + uri,
+                               pretty)
+        expected = os.path.normpath(
+            os.path.join('/destination', expected))
+        assert expected == path
 
 
 def test_removed():
@@ -81,18 +80,22 @@
           .withPage('pages/foo.md', {'layout': 'none', 'format': 'none'},
                     'a foo page'))
     with mock_fs_scope(fs):
-        fs.runChef('bake')
-        mtime = os.path.getmtime(fs.path('kitchen/_counter/foo.html'))
         time.sleep(1)
+        fs.runChef('bake', '-o', fs.path('counter'))
+        time.sleep(0.1)
+        mtime = os.path.getmtime(fs.path('counter/foo.html'))
 
-        fs.runChef('bake')
-        assert mtime == os.path.getmtime(fs.path('kitchen/_counter/foo.html'))
+        time.sleep(1)
+        fs.runChef('bake', '-o', fs.path('counter'))
+        time.sleep(0.1)
+        assert mtime == os.path.getmtime(fs.path('counter/foo.html'))
 
         MultiRecord.RECORD_VERSION += 1
         try:
-            fs.runChef('bake')
-            assert mtime < os.path.getmtime(fs.path(
-                'kitchen/_counter/foo.html'))
+            time.sleep(1)
+            fs.runChef('bake', '-o', fs.path('counter'))
+            time.sleep(0.1)
+            assert mtime < os.path.getmtime(fs.path('counter/foo.html'))
         finally:
             MultiRecord.RECORD_VERSION -= 1