diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-06-05 14:55:50 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-06-06 14:34:00 +0000 |
| commit | 123d2237e944ac55cb7edf9fb9bc01a7054d51f0 (patch) | |
| tree | 53e290d329094277685126e1c78c4959f928ca0f | |
| parent | 571e77bd59ec39a0393c69f7a53bd62d410e81ad (diff) | |
| download | buildstream-123d2237e944ac55cb7edf9fb9bc01a7054d51f0.tar.gz | |
tests/testutils/site: Remove completely and migrate HAVE_OSTREE to examples
The only place needing to know about OSTREE is the flatpak-autotools for
the documentation. We can therefore move the OSTREE business here and
remove completely the site file, ending up with a single one left.
| -rw-r--r-- | tests/examples/flatpak-autotools.py | 8 | ||||
| -rw-r--r-- | tests/testutils/site.py | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/tests/examples/flatpak-autotools.py b/tests/examples/flatpak-autotools.py index dc4a3ce15..cdc629de1 100644 --- a/tests/examples/flatpak-autotools.py +++ b/tests/examples/flatpak-autotools.py @@ -7,7 +7,6 @@ import pytest from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing.integration import assert_contains from buildstream.testing._utils.site import IS_LINUX, MACHINE_ARCH -from tests.testutils.site import HAVE_OSTREE pytestmark = pytest.mark.integration @@ -18,6 +17,13 @@ DATA_DIR = os.path.join( ) +try: + from bst_plugins_experimental.sources import _ostree # pylint: disable=unused-import + HAVE_OSTREE = True +except (ImportError, ValueError): + HAVE_OSTREE = False + + # FIXME: Workaround a setuptools bug which fails to include symbolic # links in the source distribution. # diff --git a/tests/testutils/site.py b/tests/testutils/site.py deleted file mode 100644 index 8a75f00ae..000000000 --- a/tests/testutils/site.py +++ /dev/null @@ -1,9 +0,0 @@ -# Some things resolved about the execution site, -# so we dont have to repeat this everywhere -# - -try: - from bst_plugins_experimental.sources import _ostree # pylint: disable=unused-import - HAVE_OSTREE = True -except (ImportError, ValueError): - HAVE_OSTREE = False |