From b4d4c4f59c12c9b500f83d8cd4381418e1124f67 Mon Sep 17 00:00:00 2001 From: Phil Dawson Date: Wed, 16 Jan 2019 14:03:41 +0000 Subject: Expose basic api for testing external plugins. We want external plugins to be able to make use of the core testing utils. This commit exposes the basic utilities which are currently in use in bst-external plugins. If necessary, more utilities could be exposed in the future. Moves the following files from tests/testutils/ to buildstream/plugintestingutils/: o runcli.py o integration.py As part of this, this commit makes the following changes to runcli.py and integration.py: o runcli.py: Fix linting errors o runcli.py: Add user facing documentation o Integration.py: Add user facing documentation --- tests/examples/autotools.py | 4 ++-- tests/examples/developing.py | 4 ++-- tests/examples/first-project.py | 4 ++-- tests/examples/flatpak-autotools.py | 4 ++-- tests/examples/integration-commands.py | 4 ++-- tests/examples/junctions.py | 4 ++-- tests/examples/running-commands.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/examples') diff --git a/tests/examples/autotools.py b/tests/examples/autotools.py index 30f50768b..96827ff4c 100644 --- a/tests/examples/autotools.py +++ b/tests/examples/autotools.py @@ -1,8 +1,8 @@ import os import pytest -from tests.testutils import cli_integration as cli -from tests.testutils.integration import assert_contains +from buildstream.plugintestutils import cli_integration as cli +from buildstream.plugintestutils.integration import assert_contains from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/developing.py b/tests/examples/developing.py index 166fcf374..3ef78fd36 100644 --- a/tests/examples/developing.py +++ b/tests/examples/developing.py @@ -2,8 +2,8 @@ import os import pytest import tests.testutils.patch as patch -from tests.testutils import cli_integration as cli -from tests.testutils.integration import assert_contains +from buildstream.plugintestutils import cli_integration as cli +from buildstream.plugintestutils.integration import assert_contains from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/first-project.py b/tests/examples/first-project.py index 821d2c190..35839770c 100644 --- a/tests/examples/first-project.py +++ b/tests/examples/first-project.py @@ -1,8 +1,8 @@ import os import pytest -from tests.testutils import cli_integration as cli -from tests.testutils.integration import assert_contains +from buildstream.plugintestutils import cli_integration as cli +from buildstream.plugintestutils.integration import assert_contains from tests.testutils.site import IS_LINUX diff --git a/tests/examples/flatpak-autotools.py b/tests/examples/flatpak-autotools.py index 4153a9563..454b8d0bb 100644 --- a/tests/examples/flatpak-autotools.py +++ b/tests/examples/flatpak-autotools.py @@ -1,8 +1,8 @@ import os import pytest -from tests.testutils import cli_integration as cli -from tests.testutils.integration import assert_contains +from buildstream.plugintestutils import cli_integration as cli +from buildstream.plugintestutils.integration import assert_contains from tests.testutils.site import HAVE_OSTREE, IS_LINUX, MACHINE_ARCH diff --git a/tests/examples/integration-commands.py b/tests/examples/integration-commands.py index 71e383008..abc64d951 100644 --- a/tests/examples/integration-commands.py +++ b/tests/examples/integration-commands.py @@ -1,8 +1,8 @@ import os import pytest -from tests.testutils import cli_integration as cli -from tests.testutils.integration import assert_contains +from buildstream.plugintestutils import cli_integration as cli +from buildstream.plugintestutils.integration import assert_contains from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH diff --git a/tests/examples/junctions.py b/tests/examples/junctions.py index 753fa2dc0..3992b1520 100644 --- a/tests/examples/junctions.py +++ b/tests/examples/junctions.py @@ -1,8 +1,8 @@ import os import pytest -from tests.testutils import cli_integration as cli -from tests.testutils.integration import assert_contains +from buildstream.plugintestutils import cli_integration as cli +from buildstream.plugintestutils.integration import assert_contains from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/running-commands.py b/tests/examples/running-commands.py index 61e23fd9c..6290204a9 100644 --- a/tests/examples/running-commands.py +++ b/tests/examples/running-commands.py @@ -1,8 +1,8 @@ import os import pytest -from tests.testutils import cli_integration as cli -from tests.testutils.integration import assert_contains +from buildstream.plugintestutils import cli_integration as cli +from buildstream.plugintestutils.integration import assert_contains from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH -- cgit v1.2.1