summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Maat <tm@tlater.net>2020-01-08 17:22:31 +0000
committerTristan Maat <tm@tlater.net>2020-01-08 17:22:31 +0000
commit2855243b80e6b549e338f438b89a6867cfd7ff45 (patch)
treeaa168a16100185cdbb9d6d2dd284d0a3dc536085
parent6a627efe8f5945231282191927fe41639908b4fe (diff)
parentbd3a77c304eecb59835e976122a35a1e88e26313 (diff)
downloadbuildstream-2855243b80e6b549e338f438b89a6867cfd7ff45.tar.gz
Merge branch 'tlater/fix-monkeypatch-warning' into 'master'
tests/artifactcache/config.py: Cast our tmpdir to a string See merge request BuildStream/buildstream!1790
-rw-r--r--tests/artifactcache/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py
index e5e2213eb..64e6c6a30 100644
--- a/tests/artifactcache/config.py
+++ b/tests/artifactcache/config.py
@@ -224,7 +224,7 @@ def test_paths_for_artifact_config_are_expanded(tmpdir, monkeypatch, artifacts_c
# user_config, project_config = configure_remote_caches(override_caches, project_caches, user_caches)
# project_config['name'] = 'test'
- monkeypatch.setenv("HOME", tmpdir.join("homedir"))
+ monkeypatch.setenv("HOME", str(tmpdir.join("homedir")))
if in_user_config:
user_config = {"artifacts": artifacts_config}