Mercurial > piecrust2

comparison tests/test_data_linker.py @ 411:e7b865f8f335

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bake: Enable multiprocess baking. Baking is now done by running a worker per CPU, and sending jobs to them. This changes several things across the codebase: * Ability to not cache things related to pages other than the 'main' page (i.e. the page at the bottom of the execution stack). * Decouple the baking process from the bake records, so only the main process keeps track (and modifies) the bake record. * Remove the need for 'batch page getters' and loading a page directly from the page factories. There are various smaller changes too included here, including support for scope performance timers that are saved with the bake record and can be printed out to the console. Yes I got carried away. For testing, the in-memory 'mock' file-system doesn't work anymore, since we're spawning processes, so this is replaced by a 'tmpfs' file-system which is saved in temporary files on disk and deleted after tests have run.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 12 Jun 2015 17:09:19 -0700
parents 27b10024f8d8
children f987b29d6fab
comparison
equal deleted inserted replaced
410:d1a472464e57 411:e7b865f8f335
3 from piecrust.data.linker import Linker 3 from piecrust.data.linker import Linker
4 from .mockutil import mock_fs, mock_fs_scope 4 from .mockutil import mock_fs, mock_fs_scope
5 5
6 6
7 @pytest.mark.parametrize( 7 @pytest.mark.parametrize(
8 'fs, page_path, expected', 8 'fs_fac, page_path, expected',
9 [ 9 [
10 (mock_fs().withPage('pages/foo'), 'foo.md', 10 (lambda: mock_fs().withPage('pages/foo'), 'foo.md',
11 # is_dir, name, is_self, data 11 # is_dir, name, is_self, data
12 [(False, 'foo', True, '/foo')]), 12 [(False, 'foo', True, '/foo')]),
13 ((mock_fs() 13 ((lambda: mock_fs()
14 .withPage('pages/foo') 14 .withPage('pages/foo')
15 .withPage('pages/bar')), 15 .withPage('pages/bar')),
16 'foo.md', 16 'foo.md',
17 [(False, 'bar', False, '/bar'), (False, 'foo', True, '/foo')]), 17 [(False, 'bar', False, '/bar'), (False, 'foo', True, '/foo')]),
18 ((mock_fs() 18 ((lambda: mock_fs()
19 .withPage('pages/baz') 19 .withPage('pages/baz')
20 .withPage('pages/something') 20 .withPage('pages/something')
21 .withPage('pages/something/else') 21 .withPage('pages/something/else')
22 .withPage('pages/foo') 22 .withPage('pages/foo')
23 .withPage('pages/bar')), 23 .withPage('pages/bar')),
24 'foo.md', 24 'foo.md',
25 [(False, 'bar', False, '/bar'), 25 [(False, 'bar', False, '/bar'),
26 (False, 'baz', False, '/baz'), 26 (False, 'baz', False, '/baz'),
27 (False, 'foo', True, '/foo'), 27 (False, 'foo', True, '/foo'),
28 (True, 'something', False, '/something')]), 28 (True, 'something', False, '/something')]),
29 ((mock_fs() 29 ((lambda: mock_fs()
30 .withPage('pages/something/else') 30 .withPage('pages/something/else')
31 .withPage('pages/foo') 31 .withPage('pages/foo')
32 .withPage('pages/something/good') 32 .withPage('pages/something/good')
33 .withPage('pages/bar')), 33 .withPage('pages/bar')),
34 'something/else.md', 34 'something/else.md',
35 [(False, 'else', True, '/something/else'), 35 [(False, 'else', True, '/something/else'),
36 (False, 'good', False, '/something/good')]) 36 (False, 'good', False, '/something/good')])
37 ]) 37 ])
38 def test_linker_iteration(fs, page_path, expected): 38 def test_linker_iteration(fs_fac, page_path, expected):
39 fs = fs_fac()
39 with mock_fs_scope(fs): 40 with mock_fs_scope(fs):
40 app = fs.getApp() 41 app = fs.getApp()
41 app.config.set('site/pretty_urls', True) 42 app.config.set('site/pretty_urls', True)
42 src = app.getSource('pages') 43 src = app.getSource('pages')
43 linker = Linker(src, os.path.dirname(page_path), 44 linker = Linker(src, os.path.dirname(page_path),
52 assert a.is_self == is_self 53 assert a.is_self == is_self
53 assert a.url == url 54 assert a.url == url
54 55
55 56
56 @pytest.mark.parametrize( 57 @pytest.mark.parametrize(
57 'fs, page_path, expected', 58 'fs_fac, page_path, expected',
58 [ 59 [
59 (mock_fs().withPage('pages/foo'), 'foo.md', 60 (lambda: mock_fs().withPage('pages/foo'), 'foo.md',
60 [('/foo', True)]), 61 [('/foo', True)]),
61 ((mock_fs() 62 ((lambda: mock_fs()
62 .withPage('pages/foo') 63 .withPage('pages/foo')
63 .withPage('pages/bar')), 64 .withPage('pages/bar')),
64 'foo.md', 65 'foo.md',
65 [('/bar', False), ('/foo', True)]), 66 [('/bar', False), ('/foo', True)]),
66 ((mock_fs() 67 ((lambda: mock_fs()
67 .withPage('pages/baz') 68 .withPage('pages/baz')
68 .withPage('pages/something/else') 69 .withPage('pages/something/else')
69 .withPage('pages/foo') 70 .withPage('pages/foo')
70 .withPage('pages/bar')), 71 .withPage('pages/bar')),
71 'foo.md', 72 'foo.md',
72 [('/bar', False), ('/baz', False), 73 [('/bar', False), ('/baz', False),
73 ('/foo', True), ('/something/else', False)]), 74 ('/foo', True), ('/something/else', False)]),
74 ((mock_fs() 75 ((lambda: mock_fs()
75 .withPage('pages/something/else') 76 .withPage('pages/something/else')
76 .withPage('pages/foo') 77 .withPage('pages/foo')
77 .withPage('pages/something/good') 78 .withPage('pages/something/good')
78 .withPage('pages/bar')), 79 .withPage('pages/bar')),
79 'something/else.md', 80 'something/else.md',
80 [('/something/else', True), 81 [('/something/else', True),
81 ('/something/good', False)]) 82 ('/something/good', False)])
82 ]) 83 ])
83 def test_recursive_linker_iteration(fs, page_path, expected): 84 def test_recursive_linker_iteration(fs_fac, page_path, expected):
85 fs = fs_fac()
84 with mock_fs_scope(fs): 86 with mock_fs_scope(fs):
85 app = fs.getApp() 87 app = fs.getApp()
86 app.config.set('site/pretty_urls', True) 88 app.config.set('site/pretty_urls', True)
87 src = app.getSource('pages') 89 src = app.getSource('pages')
88 linker = Linker(src, os.path.dirname(page_path), 90 linker = Linker(src, os.path.dirname(page_path),