From 2a9be17cf689db03523207197ad3228164a983d2 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Tue, 20 Jun 2017 15:56:33 -0400 Subject: [PATCH] Fix some brittle query tests These were written to incidentally depend on Nones; the behavior they're actually testing doesn't really have anything to say about None-ness. --- test/test_dbcore.py | 2 +- test/test_query.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_dbcore.py b/test/test_dbcore.py index d070e257e..d2d97d4b3 100644 --- a/test/test_dbcore.py +++ b/test/test_dbcore.py @@ -320,7 +320,7 @@ class ModelTest(unittest.TestCase): def test_items(self): model = TestModel1(self.db) model.id = 5 - self.assertEqual({('id', 5), ('field_one', None)}, + self.assertEqual({('id', 5), ('field_one', 0)}, set(model.items())) def test_delete_internal_field(self): diff --git a/test/test_query.py b/test/test_query.py index 61df3ca10..c0ab2a171 100644 --- a/test/test_query.py +++ b/test/test_query.py @@ -79,10 +79,10 @@ class AnyFieldQueryTest(_common.LibTestCase): class AssertsMixin(object): def assert_items_matched(self, results, titles): - self.assertEqual([i.title for i in results], titles) + self.assertEqual(set([i.title for i in results]), set(titles)) def assert_albums_matched(self, results, albums): - self.assertEqual([a.album for a in results], albums) + self.assertEqual(set([a.album for a in results]), set(albums)) # A test case class providing a library with some dummy data and some