diff options
| author | Phil Dawson <phil.dawson@codethink.co.uk> | 2019-04-15 11:02:33 +0100 |
|---|---|---|
| committer | Phil Dawson <phil.dawson@codethink.co.uk> | 2019-04-16 14:25:40 +0100 |
| commit | 97bbedbef15fc9edea5b04f66a30ec788da7f130 (patch) | |
| tree | 109707eaf268fbf104e3ec2cdad337f2fde81c3d /tests/conftest.py | |
| parent | 9d7d803bbefed364ad58b4b5b5305f4e210bb5e1 (diff) | |
| download | buildstream-97bbedbef15fc9edea5b04f66a30ec788da7f130.tar.gz | |
plugintestutils: Rename 'plugintestutils' package to 'testing'phil/rename-plugintestutils
- Rename plugintestutils to testing.
- Don't run the tests from bst-plugins-template. This imports
buildstream.plugintestutils so will have to be disabled to get
through CI. This can be re nabled once bst-plugins-template has been
patched.
Diffstat (limited to 'tests/conftest.py')
| -rwxr-xr-x | tests/conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index fefd2f755..9b8ff2414 100755 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -24,7 +24,7 @@ import shutil import tempfile import pytest from buildstream._platform.platform import Platform -from buildstream.plugintestutils import register_repo_kind, sourcetests_collection_hook +from buildstream.testing import register_repo_kind, sourcetests_collection_hook from tests.testutils.repo.git import Git from tests.testutils.repo.bzr import Bzr @@ -177,6 +177,6 @@ register_repo_kind('zip', Zip) # This hook enables pytest to collect the templated source tests from -# buildstream.plugintestutils +# buildstream.testing def pytest_sessionstart(session): sourcetests_collection_hook(session) |