Unified Diff: tests/conftest.py
Issue 29912588:
Issue 7019 - [CMS] Refactor `test_server.py` (Closed)
Patch Set: Simplified server waiting logic
Created Oct. 29, 2018, 10:40 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« cms/bin/test_server.py ('k')
|
tests/test_dynamic_server.py » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: tests/conftest.py |
| diff --git a/tests/conftest.py b/tests/conftest.py |
| index a8c274223cafc15d1ed829f2bcfa1fe95eef62f5..23f2d767501267d65b7da56840e85dc9f8b8e297 100644 |
| --- a/tests/conftest.py |
| +++ b/tests/conftest.py |
| @@ -21,3 +21,16 @@ def temp_site(tmpdir_factory): |
| shutil.copytree(os.path.join(ROOTPATH, 'tests', 'test_site'), site_dir) |
| yield site_dir |
| + |
| + |
| +@pytest.fixture(scope='session') |
| +def temp_site_with_conflicts(tmpdir_factory): |
| + out_dir = tmpdir_factory.mktemp('temp_out_conflicts') |
| + site_dir = out_dir.join('test_site').strpath |
| + |
| + shutil.copytree(os.path.join(ROOTPATH, 'tests', 'test_site'), site_dir) |
| + translate_file = os.path.join(site_dir, 'locales', 'en', 'translate') |
| + with open(translate_file, 'w') as f: |
| + f.write('Page with conflicts') |
| + |
| + yield site_dir |
« no previous file with comments
|
« cms/bin/test_server.py ('k')
|
tests/test_dynamic_server.py » ('j')
|
no next file with comments »
