From 8f96bf0f394f2a19e85400dda622c78e6188117e Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sat, 4 Apr 2015 11:33:32 +0200 Subject: [PATCH] tests: Fix some model use oddities --- tests/local/test_tracklist.py | 2 +- tests/mpd/test_translator.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/local/test_tracklist.py b/tests/local/test_tracklist.py index 22d4c954..ca36ac44 100644 --- a/tests/local/test_tracklist.py +++ b/tests/local/test_tracklist.py @@ -103,7 +103,7 @@ class LocalTracklistProviderTest(unittest.TestCase): def test_filter_by_uri_returns_nothing_if_no_match(self): self.controller.playlist = Playlist( - tracks=[Track(uri=['z']), Track(uri=['y'])]) + tracks=[Track(uri='z'), Track(uri='y')]) self.assertEqual([], self.controller.filter(uri=['a'])) def test_filter_by_multiple_criteria_returns_elements_matching_all(self): diff --git a/tests/mpd/test_translator.py b/tests/mpd/test_translator.py index bf50687d..3a9b00d8 100644 --- a/tests/mpd/test_translator.py +++ b/tests/mpd/test_translator.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, unicode_literals -import datetime import unittest from mopidy.models import Album, Artist, Playlist, TlTrack, Track @@ -20,8 +19,8 @@ class TrackMpdFormatTest(unittest.TestCase): composers=[Artist(name='a composer')], performers=[Artist(name='a performer')], genre='a genre', - date=datetime.date(1977, 1, 1), - disc_no='1', + date='1977-1-1', + disc_no=1, comment='a comment', length=137000, ) @@ -73,8 +72,8 @@ class TrackMpdFormatTest(unittest.TestCase): self.assertIn(('Performer', 'a performer'), result) self.assertIn(('Genre', 'a genre'), result) self.assertIn(('Track', '7/13'), result) - self.assertIn(('Date', datetime.date(1977, 1, 1)), result) - self.assertIn(('Disc', '1'), result) + self.assertIn(('Date', '1977-1-1'), result) + self.assertIn(('Disc', 1), result) self.assertIn(('Pos', 9), result) self.assertIn(('Id', 122), result) self.assertNotIn(('Comment', 'a comment'), result)