summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorBenjamin Schubert <contact@benschubert.me>2019-10-07 13:52:16 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-10-08 09:39:19 +0000
commit7f00500184d799539980ad5fc4d5ef5ddde16d35 (patch)
treee31d0addd07b9f83510692f313bf344bd009f719 /setup.cfg
parentd913e5cbf8035fac76b90cde3cac71b08ec70a13 (diff)
downloadbuildstream-7f00500184d799539980ad5fc4d5ef5ddde16d35.tar.gz
setup.cfg: Fix xdg env vars to not affect the hostbschubert/fix-xdg-temppaths
A fix was made in https://gitlab.com/BuildStream/buildstream/merge_requests/1244 in order to set xdg_* env variables inside of the test's directory to avoid importing data from the host. There was however still two problems: - When a variable was not set, it was set with a relative path, which would create a configuration for BuildStream that is invalid. - When a variable was set and running with pytest directly, we would still use the variable's value, which would be the host one. This ensure this can never happen, by not relying on the same variable's name and always overriding them.
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg5
1 files changed, 1 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg
index 7a62f9282..a8919fdca 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,10 +16,7 @@ norecursedirs = tests/integration/project integration-cache tmp __pycache__ .egg
python_files = tests/*/*.py
env =
D:BST_TEST_SUITE=True
- D:HOME=./tmp
- D:XDG_CACHE_HOME=./tmp/cache
- D:XDG_CONFIG_HOME=./tmp/config
- D:XDG_DATA_HOME=./tmp/share
+
markers =
integration: run test only if --integration option is specified
remoteexecution: run test only if --remote-execution option is specified