diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-09-24 08:16:43 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-09-24 08:16:43 +0000 |
| commit | bc2acf77186d020d8f42230779a824ab973e135b (patch) | |
| tree | 6d4dcbe45cf37cb7b989ea08324836899143757c | |
| parent | fc0136c62bf065a94e7fe192a673e708dc0778c7 (diff) | |
| parent | 80fdd0a424e404039d09a78cd3085ce53a6d237e (diff) | |
| download | buildstream-bc2acf77186d020d8f42230779a824ab973e135b.tar.gz | |
Merge branch 'coldtom/mark-filter-test-integration' into 'master'
tests: Add some missing integration marks
See merge request BuildStream/buildstream!1609
| -rw-r--r-- | tests/integration/filter.py | 3 | ||||
| -rw-r--r-- | tests/integration/pullbuildtrees.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/integration/filter.py b/tests/integration/filter.py index 1d9c11b01..2a32d4010 100644 --- a/tests/integration/filter.py +++ b/tests/integration/filter.py @@ -10,6 +10,9 @@ from buildstream.testing.integration import assert_contains from buildstream.testing._utils.site import HAVE_SANDBOX +pytestmark = pytest.mark.integration + + DATA_DIR = os.path.join( os.path.dirname(os.path.realpath(__file__)), 'project' diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py index 4251aa6d0..a1b188e5a 100644 --- a/tests/integration/pullbuildtrees.py +++ b/tests/integration/pullbuildtrees.py @@ -13,6 +13,9 @@ from buildstream._exceptions import ErrorDomain, LoadErrorReason from tests.testutils import create_artifact_share +pytestmark = pytest.mark.integration + + DATA_DIR = os.path.join( os.path.dirname(os.path.realpath(__file__)), "project" |