diff --git a/tests/local/test_library.py b/tests/local/test_library.py index 575f1fb8..882b992b 100644 --- a/tests/local/test_library.py +++ b/tests/local/test_library.py @@ -284,8 +284,9 @@ class LocalLibraryProviderTest(unittest.TestCase): # Matches on track album artists result = self.library.find_exact(any=['artist3']) - self.assertEqual( - list(result[0].tracks), [self.tracks[3], self.tracks[2]]) + self.assertEqual(len(result[0].tracks), 2) + self.assertIn(self.tracks[2], result[0].tracks) + self.assertIn(self.tracks[3], result[0].tracks) # Matches on track composer result = self.library.find_exact(any=['artist5']) @@ -502,8 +503,9 @@ class LocalLibraryProviderTest(unittest.TestCase): # Matches on track album artists result = self.library.search(any=['Tist3']) - self.assertEqual( - list(result[0].tracks), [self.tracks[3], self.tracks[2]]) + self.assertEqual(len(result[0].tracks), 2) + self.assertIn(self.tracks[2], result[0].tracks) + self.assertIn(self.tracks[3], result[0].tracks) # Matches on track genre result = self.library.search(any=['Enre1']) diff --git a/tests/utils/test_jsonrpc.py b/tests/utils/test_jsonrpc.py index 6bd6a32b..4ddb6611 100644 --- a/tests/utils/test_jsonrpc.py +++ b/tests/utils/test_jsonrpc.py @@ -91,10 +91,13 @@ class JsonRpcSerializationTest(JsonRpcTestBase): self.jrw.handle_data.return_value = {'foo': models.Artist(name='bar')} request = '[]' - response = self.jrw.handle_json(request) + response = json.loads(self.jrw.handle_json(request)) - self.assertEqual( - response, '{"foo": {"__model__": "Artist", "name": "bar"}}') + self.assertIn('foo', response) + self.assertIn('__model__', response['foo']) + self.assertEqual(response['foo']['__model__'], 'Artist') + self.assertIn('name', response['foo']) + self.assertEqual(response['foo']['name'], 'bar') def test_handle_json_returns_nothing_for_notices(self): request = '{"jsonrpc": "2.0", "method": "core.get_uri_schemes"}'