Side by Side 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.
| Left: | ||
| Right: |
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 »
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 from __future__ import unicode_literals | 1 from __future__ import unicode_literals |
| 2 | 2 |
| 3 import os | 3 import os |
| 4 import pytest | 4 import pytest |
| 5 import shutil | 5 import shutil |
| 6 | 6 |
| 7 pytest_plugins = [ | 7 pytest_plugins = [ |
| 8 'tests.xtm_conftest', | 8 'tests.xtm_conftest', |
| 9 ] | 9 ] |
| 10 | 10 |
| 11 _INTERCEPT_PORT = 443 | 11 _INTERCEPT_PORT = 443 |
| 12 _INTERCEPT_HOST = 'wstest2.xtm-intl.com' | 12 _INTERCEPT_HOST = 'wstest2.xtm-intl.com' |
| 13 | 13 |
| 14 ROOTPATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) | 14 ROOTPATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |
| 15 | 15 |
| 16 | 16 |
| 17 @pytest.fixture(scope='session') | 17 @pytest.fixture(scope='session') |
| 18 def temp_site(tmpdir_factory): | 18 def temp_site(tmpdir_factory): |
| 19 out_dir = tmpdir_factory.mktemp('temp_out') | 19 out_dir = tmpdir_factory.mktemp('temp_out') |
| 20 site_dir = out_dir.join('test_site').strpath | 20 site_dir = out_dir.join('test_site').strpath |
| 21 | 21 |
| 22 shutil.copytree(os.path.join(ROOTPATH, 'tests', 'test_site'), site_dir) | 22 shutil.copytree(os.path.join(ROOTPATH, 'tests', 'test_site'), site_dir) |
| 23 yield site_dir | 23 yield site_dir |
| 24 | |
| 25 | |
| 26 @pytest.fixture(scope='session') | |
| 27 def temp_site_with_conflicts(tmpdir_factory): | |
| 28 out_dir = tmpdir_factory.mktemp('temp_out_conflicts') | |
| 29 site_dir = out_dir.join('test_site').strpath | |
| 30 | |
| 31 shutil.copytree(os.path.join(ROOTPATH, 'tests', 'test_site'), site_dir) | |
| 32 translate_file = os.path.join(site_dir, 'locales', 'en', 'translate') | |
| 33 with open(translate_file, 'w') as f: | |
| 34 f.write('Page with conflicts') | |
| 35 | |
| 36 yield site_dir | |
| OLD | NEW |
« no previous file with comments
|
« cms/bin/test_server.py ('k')
|
tests/test_dynamic_server.py » ('j')
|
no next file with comments »
