Side by Side Diff: tests/conftest.py
Issue 29400555:
Issue 4992 - Adds optional revision arg to generate_static_pages (Closed)
Base URL: https://hg.adblockplus.org/cms
Patch Set:
Created April 1, 2017, 12:23 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« cms/sources.py ('K')
|
« cms/sources.py ('k')
|
tests/test_page_outputs.py » ('j')
|
tests/test_page_outputs.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 import os | 1 import os |
| 2 import pytest | 2 import pytest |
| 3 import shutil | 3 import shutil |
| 4 import subprocess | 4 import subprocess |
| 5 | 5 |
| 6 | 6 |
| 7 ROOTPATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) | 7 ROOTPATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |
| 8 | 8 |
| 9 | 9 |
| 10 @pytest.fixture(scope='session') | 10 @pytest.fixture(scope='session') |
| 11 def temp_site(tmpdir_factory): | 11 def temp_site(tmpdir_factory): |
| 12 out_dir = tmpdir_factory.mktemp('temp_out') | 12 out_dir = tmpdir_factory.mktemp('temp_out') |
| 13 site_dir = out_dir.join('test_site').strpath | 13 site_dir = out_dir.join('test_site').strpath |
| 14 | 14 |
| 15 shutil.copytree(os.path.join(ROOTPATH, 'tests', 'test_site'), site_dir) | 15 shutil.copytree(os.path.join(ROOTPATH, 'tests', 'test_site'), site_dir) |
| 16 subprocess.check_call(['hg', 'init', site_dir]) | 16 subprocess.check_call(['hg', 'init', site_dir]) |
| 17 subprocess.check_call(['hg', '-R', site_dir, 'commit', '-A', '-m', 'foo']) | 17 subprocess.check_call(['hg', '-R', site_dir, 'commit', '-A', '-m', 'foo']) |
| 18 | |
| 19 subprocess.check_call(['hg', '-R', site_dir, 'bookmark', 'master']) | |
| 20 subprocess.check_call(['hg', '-R', site_dir, 'bookmark', 'test']) | |
|
Vasily Kuznetsov
2017/04/03 09:55:08
Are we actually using this second bookmark?
Jon Sonesen
2017/04/03 10:10:59
yes, it is what we use to commit the 'bar.md' file
| |
| 21 subprocess.check_call(['touch', os.path.join(site_dir, 'pages', 'bar.md')]) | |
| 22 subprocess.check_call(['hg', '-R', site_dir, 'commit', '-A', '-m', 'bar']) | |
| 18 yield site_dir | 23 yield site_dir |
| OLD | NEW |
« cms/sources.py ('K')
|
« cms/sources.py ('k')
|
tests/test_page_outputs.py » ('j')
|
tests/test_page_outputs.py » ('J')
