MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed failing tests

This commit is contained in:
Eliot Berriot 2020-02-18 15:34:10 +01:00
parent 14d5b0c69c
commit f8675c6080
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/common/cache.py
View File

@ -8,7 +8,7 @@ logger = logging.getLogger(__name__)
class RedisClient(default.DefaultClient): class RedisClient(default.DefaultClient):
def get(self, key, default=None, version=None, client=None): def get(self, key, default=None, version=None, client=None):
try: try:
return super().get(key, default=None, version=None, client=None) return super().get(key, default=default, version=version, client=client)
except ValueError as e: except ValueError as e:
if "unsupported pickle protocol" in str(e): if "unsupported pickle protocol" in str(e):
# pickle deserialization error # pickle deserialization error

3
api/funkwhale_api/subsonic/renderers.py
View File

@ -1,3 +1,4 @@
import collections
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from rest_framework import renderers from rest_framework import renderers
@ -40,7 +41,7 @@ def structure_payload(data):
payload["error"] = {"code": 0, "message": payload.pop("detail")} payload["error"] = {"code": 0, "message": payload.pop("detail")}
if "error" in payload: if "error" in payload:
payload["status"] = "failed" payload["status"] = "failed"
return payload return collections.OrderedDict(sorted(payload.items(), key=lambda v: v[0]))
class SubsonicJSONRenderer(renderers.JSONRenderer): class SubsonicJSONRenderer(renderers.JSONRenderer):

2
api/tests/subsonic/test_renderers.py
View File

@ -80,7 +80,7 @@ def test_xml_renderer_dict_to_xml():
def test_xml_renderer(): def test_xml_renderer():
payload = {"hello": "world"} payload = {"hello": "world"}
expected = '<?xml version="1.0" encoding="UTF-8"?>\n<subsonic-response funkwhaleVersion="{}" status="ok" type="funkwhale" version="1.16.0" hello="world" xmlns="http://subsonic.org/restapi" />' # noqa expected = '<?xml version="1.0" encoding="UTF-8"?>\n<subsonic-response funkwhaleVersion="{}" hello="world" status="ok" type="funkwhale" version="1.16.0" xmlns="http://subsonic.org/restapi" />' # noqa
expected = expected.format(funkwhale_api.__version__).encode() expected = expected.format(funkwhale_api.__version__).encode()
renderer = renderers.SubsonicXMLRenderer() renderer = renderers.SubsonicXMLRenderer()