From 43adba115bc4c9502c9d7702ebc0f6516cfe1be1 Mon Sep 17 00:00:00 2001 From: Stefan Wojcik Date: Mon, 28 Nov 2016 15:22:38 -0500 Subject: [PATCH] flake8 tweaks to tests.queryset.transform --- tests/queryset/transform.py | 41 ++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py index 1cb8223d..06fe4ea5 100644 --- a/tests/queryset/transform.py +++ b/tests/queryset/transform.py @@ -1,11 +1,7 @@ -import sys -sys.path[0:0] = [""] - import unittest from mongoengine import * -from mongoengine.queryset import Q -from mongoengine.queryset import transform +from mongoengine.queryset import Q, transform __all__ = ("TransformTest",) @@ -41,8 +37,8 @@ class TransformTest(unittest.TestCase): DicDoc.drop_collection() Doc.drop_collection() + DicDoc().save() doc = Doc().save() - dic_doc = DicDoc().save() for k, v in (("set", "$set"), ("set_on_insert", "$setOnInsert"), ("push", "$push")): update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc}) @@ -55,7 +51,6 @@ class TransformTest(unittest.TestCase): update = transform.update(DicDoc, pull__dictField__test=doc) self.assertTrue(isinstance(update["$pull"]["dictField"]["test"], dict)) - def test_query_field_name(self): """Ensure that the correct field name is used when querying. """ @@ -156,26 +151,33 @@ class TransformTest(unittest.TestCase): class Doc(Document): meta = {'allow_inheritance': False} - raw_query = Doc.objects(__raw__={'deleted': False, - 'scraped': 'yes', - '$nor': [{'views.extracted': 'no'}, - {'attachments.views.extracted':'no'}] - })._query + raw_query = Doc.objects(__raw__={ + 'deleted': False, + 'scraped': 'yes', + '$nor': [ + {'views.extracted': 'no'}, + {'attachments.views.extracted': 'no'} + ] + })._query - expected = {'deleted': False, 'scraped': 'yes', - '$nor': [{'views.extracted': 'no'}, - {'attachments.views.extracted': 'no'}]} - self.assertEqual(expected, raw_query) + self.assertEqual(raw_query, { + 'deleted': False, + 'scraped': 'yes', + '$nor': [ + {'views.extracted': 'no'}, + {'attachments.views.extracted': 'no'} + ] + }) def test_geojson_PointField(self): class Location(Document): loc = PointField() update = transform.update(Location, set__loc=[1, 2]) - self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1,2]}}}) + self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1, 2]}}}) - update = transform.update(Location, set__loc={"type": "Point", "coordinates": [1,2]}) - self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1,2]}}}) + update = transform.update(Location, set__loc={"type": "Point", "coordinates": [1, 2]}) + self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1, 2]}}}) def test_geojson_LineStringField(self): class Location(Document): @@ -238,5 +240,6 @@ class TransformTest(unittest.TestCase): events = Event.objects(location__within=box) self.assertRaises(InvalidQueryError, lambda: events.count()) + if __name__ == '__main__': unittest.main()