diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2019-03-20 15:25:07 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2019-03-20 15:25:07 +0900 |
| commit | f1edb51d83611bb24ddb4934160a558cf926aa0b (patch) | |
| tree | 81350141dba5455b580d4fb971a54f06bf7503a5 | |
| parent | 964261032b8ad1864680a9a38da9c27d8e1bf3c7 (diff) | |
| download | buildstream-f1edb51d83611bb24ddb4934160a558cf926aa0b.tar.gz | |
tests: Move conftest.py into tests/ subdirectory
Pytest implicitly loads this file from the CWD where it runs,
which is usually the project toplevel directory, but also supports
loading it from the `tests/` subdirectory where tests are run from.
Placing it into the `tests/` subdirectory is not perfectly explicit,
but is at least a hint to the unsuspecting developer that this file
is related to tests.
| -rwxr-xr-x | tests/conftest.py (renamed from conftest.py) | 0 | ||||
| -rw-r--r-- | tests/integration/cachedfail.py | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/conftest.py b/tests/conftest.py index 7f8da3633..7f8da3633 100755 --- a/conftest.py +++ b/tests/conftest.py diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py index 108182b60..171a21afc 100644 --- a/tests/integration/cachedfail.py +++ b/tests/integration/cachedfail.py @@ -5,7 +5,7 @@ from buildstream import _yaml from buildstream._exceptions import ErrorDomain from buildstream.plugintestutils import cli_integration as cli -from conftest import clean_platform_cache +from tests.conftest import clean_platform_cache from tests.testutils import create_artifact_share from tests.testutils.site import HAVE_BWRAP, IS_LINUX, HAVE_SANDBOX |