Unified Diff: sitescripts/extensions/test/utils.py
Issue 29940559:
Issue 7112 - Add centralised conftest (Closed)
Patch Set: Addressed comments from Patch Set #1
Created Nov. 14, 2018, 4:08 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« sitescripts/extensions/test/conftest.py ('k')
|
tests/__init__.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: sitescripts/extensions/test/utils.py |
| diff --git a/sitescripts/extensions/test/conftest.py b/sitescripts/extensions/test/utils.py |
| similarity index 97% |
| rename from sitescripts/extensions/test/conftest.py |
| rename to sitescripts/extensions/test/utils.py |
| index f673937bc919b02b20b38b352ceaf9561cafb1de..80844bfd18fecfcc4893d1b8935f211614427dfe 100644 |
| --- a/sitescripts/extensions/test/conftest.py |
| +++ b/sitescripts/extensions/test/utils.py |
| @@ -26,7 +26,7 @@ import py |
| @pytest.fixture(scope='session') |
| def tests_dir(): |
| """Directory that contains this tests and the data files it uses.""" |
| - return py.path.local(__file__).dirpath() |
| + return py.path.local('sitescripts/extensions/test/') |
|
Vasily Kuznetsov
2018/11/14 16:34:40
I think it's better to use the approach based on _
Tudor Avram
2018/11/14 17:00:19
Done.
|
| @pytest.fixture(scope='session') |
« no previous file with comments
|
« sitescripts/extensions/test/conftest.py ('k')
|
tests/__init__.py » ('j')
|
no next file with comments »
