diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-06-06 10:19:01 +0100 |
|---|---|---|
| committer | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-06-06 14:37:59 +0100 |
| commit | 790206c03bc59892f0da7acf6d92b24b14091c5c (patch) | |
| tree | 08b5d47cbd9b1b4f3de69aac412e34f4d49f887e | |
| parent | 668a6bafa2512d6b9df8f99dece6df5e1b2366fe (diff) | |
| download | buildstream-bschubert/site-consolidation.tar.gz | |
tests/examples/flatpak-autotools: rename HAVE_OSTREE to HAVE_OSTREE_PLUGINbschubert/site-consolidation
What this checks does is check if the ostree plugin is installed and
fully configured. Renaming to HAVE_OSTREE_PLUGIN makes it slightly more
explicit
| -rw-r--r-- | tests/examples/flatpak-autotools.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/examples/flatpak-autotools.py b/tests/examples/flatpak-autotools.py index cdc629de1..2418807c0 100644 --- a/tests/examples/flatpak-autotools.py +++ b/tests/examples/flatpak-autotools.py @@ -19,9 +19,11 @@ DATA_DIR = os.path.join( try: from bst_plugins_experimental.sources import _ostree # pylint: disable=unused-import - HAVE_OSTREE = True + # Even when we have the plugin, it might be missing dependencies. This requires + # bst_plugins_experimantal to be fully installed, with host ostree dependencies + HAVE_OSTREE_PLUGIN = True except (ImportError, ValueError): - HAVE_OSTREE = False + HAVE_OSTREE_PLUGIN = False # FIXME: Workaround a setuptools bug which fails to include symbolic @@ -44,7 +46,7 @@ def workaround_setuptools_bug(project): # amhello project for this. @pytest.mark.skipif(MACHINE_ARCH != 'x86-64', reason='Examples are written for x86-64') -@pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree') +@pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE_PLUGIN, reason='Only available on linux with ostree') @pytest.mark.datafiles(DATA_DIR) def test_autotools_build(cli, datafiles): project = str(datafiles) @@ -67,7 +69,7 @@ def test_autotools_build(cli, datafiles): # Test running an executable built with autotools @pytest.mark.skipif(MACHINE_ARCH != 'x86-64', reason='Examples are written for x86-64') -@pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree') +@pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE_PLUGIN, reason='Only available on linux with ostree') @pytest.mark.datafiles(DATA_DIR) def test_autotools_run(cli, datafiles): project = str(datafiles) |