summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-10-22 12:12:30 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-10-22 12:12:30 +0000
commitaadd6756d028c1ccbbd47d49dbb2e038d059d1e4 (patch)
treec2db5d7f6f797df399bdf3ba3d1c12979fc0d3fb
parent735b005f62f3083f46d6cdba837aa0e320856ea3 (diff)
parentf4503d1552d8012fa1ad4175bee1d917e4e6ff69 (diff)
downloadbuildstream-aadd6756d028c1ccbbd47d49dbb2e038d059d1e4.tar.gz
Merge branch 'chandan/register-pytest-mark' into 'master'
setup.cfg: Register mark for pytest-datafiles See merge request BuildStream/buildstream!1662
-rw-r--r--setup.cfg1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.cfg b/setup.cfg
index 2264a317c..53a83541c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ env =
D:BST_TEST_SUITE=True
markers =
+ datafiles: data files for tests
integration: run test only if --integration option is specified
remoteexecution: run test only if --remote-execution option is specified
in_subprocess: run test in a Python process forked from the main one