From a87a2837dbc73fc611100ce90b81fd08e98c6fc4 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 25 Mar 2018 22:34:30 +0200
Subject: [PATCH] Fixed failing tests
---
api/tests/common/test_fields.py | 2 +-
api/tests/conftest.py | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/api/tests/common/test_fields.py b/api/tests/common/test_fields.py
index 7c63431a..29a8fb05 100644
--- a/api/tests/common/test_fields.py
+++ b/api/tests/common/test_fields.py
@@ -10,7 +10,7 @@ from funkwhale_api.users.factories import UserFactory
@pytest.mark.parametrize('user,expected', [
(AnonymousUser(), Q(privacy_level='everyone')),
(UserFactory.build(pk=1),
- Q(privacy_level__in=['me', 'followers', 'instance', 'everyone'])),
+ Q(privacy_level__in=['followers', 'instance', 'everyone'])),
])
def test_privacy_level_query(user,expected):
query = fields.privacy_level_query(user)
diff --git a/api/tests/conftest.py b/api/tests/conftest.py
index 06d225a0..d2ff01bc 100644
--- a/api/tests/conftest.py
+++ b/api/tests/conftest.py
@@ -132,3 +132,11 @@ def activity_registry():
@pytest.fixture
def activity_muted(activity_registry, mocker):
yield mocker.patch.object(record, 'send')
+
+
+@pytest.fixture(autouse=True)
+def media_root(settings):
+ tmp_dir = tempfile.mkdtemp()
+ settings.MEDIA_ROOT = tmp_dir
+ yield settings.MEDIA_ROOT
+ shutil.rmtree(tmp_dir)
--
GitLab