summaryrefslogtreecommitdiff
path: root/tests/integration/workspace.py
diff options
context:
space:
mode:
authorChandan Singh <csingh43@bloomberg.net>2019-03-01 18:39:24 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-01 19:51:57 +0000
commitd9cd7b70e2e1724013178ee3a04ce0c01df45937 (patch)
treedb8f6af855088ac6351d7b0e7aadc12de6a9c305 /tests/integration/workspace.py
parent52e6d2e3cb4a01fc8b7ae4d46d1f42f76059466d (diff)
downloadbuildstream-d9cd7b70e2e1724013178ee3a04ce0c01df45937.tar.gz
tests: Remove redundant integration pytest markers
Remove `pytest.mark.integration` for individual tests that already include it in `pytestmarker` at the top. FWIW the list of such files was found using: git grep --name-only 'pytestmark = pytest.mark.integration' | xargs grep '@pytest.mark.integration'
Diffstat (limited to 'tests/integration/workspace.py')
-rw-r--r--tests/integration/workspace.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/integration/workspace.py b/tests/integration/workspace.py
index 88a4a1f84..fd2aff3ac 100644
--- a/tests/integration/workspace.py
+++ b/tests/integration/workspace.py
@@ -15,7 +15,6 @@ DATA_DIR = os.path.join(
)
-@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
def test_workspace_mount(cli, datafiles):
@@ -32,7 +31,6 @@ def test_workspace_mount(cli, datafiles):
assert os.path.exists(os.path.join(cli.directory, 'workspace'))
-@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
def test_workspace_commanddir(cli, datafiles):
@@ -50,7 +48,6 @@ def test_workspace_commanddir(cli, datafiles):
assert os.path.exists(os.path.join(cli.directory, 'workspace', 'build'))
-@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
def test_workspace_updated_dependency(cli, datafiles):
@@ -105,7 +102,6 @@ def test_workspace_updated_dependency(cli, datafiles):
assert res.output == 'Hello china!\n\n'
-@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
def test_workspace_update_dependency_failed(cli, datafiles):
@@ -181,7 +177,6 @@ def test_workspace_update_dependency_failed(cli, datafiles):
assert res.output == 'Hello world!\nHello spain!\n\n'
-@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
def test_updated_dependency_nested(cli, datafiles):
@@ -235,7 +230,6 @@ def test_updated_dependency_nested(cli, datafiles):
assert res.output == 'Hello world!\nHello test!\n\n'
-@pytest.mark.integration
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
def test_incremental_configure_commands_run_only_once(cli, datafiles):