ran yapf on relevant code

datmo · May 8, 2018 · 2c70465 · 2c70465
1 parent 266f1a6
commit 2c70465
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 63 deletions.
diff --git a/datmo/core/storage/local/tests/test_dal_environment.py b/datmo/core/storage/local/tests/test_dal_environment.py
@@ -139,51 +139,48 @@ def test_query_environments_basic(self):
         assert len(self.dal.environment.query({"id": environment.id})) == 1
 
     def test_query_environments_multiple(self):
-        environment_1 = self.dal.environment.create(Environment(self.environment_input_dict))
-        environment_2 = self.dal.environment.create(Environment(self.environment_input_dict))
-        environment_3 = self.dal.environment.create(Environment(self.environment_input_dict))
+        environment_1 = self.dal.environment.create(
+            Environment(self.environment_input_dict))
+        environment_2 = self.dal.environment.create(
+            Environment(self.environment_input_dict))
+        environment_3 = self.dal.environment.create(
+            Environment(self.environment_input_dict))
 
-        results = self.dal.environment.query({},
-            sort_key="created_at",
-            sort_order="ascending")
+        results = self.dal.environment.query(
+            {}, sort_key="created_at", sort_order="ascending")
         assert len(results) == 3
         assert results[0].created_at == environment_1.created_at
         assert results[1].created_at == environment_2.created_at
 
-        results = self.dal.environment.query({},
-            sort_key="created_at",
-            sort_order="descending")
+        results = self.dal.environment.query(
+            {}, sort_key="created_at", sort_order="descending")
         assert len(results) == 3
         assert results[0].created_at == environment_3.created_at
         assert results[1].created_at == environment_2.created_at
 
         # Wrong order being passed in
         failed = False
         try:
-            _ = self.dal.environment.query({},
-                sort_key='created_at',
-                sort_order='wrong_order')
+            _ = self.dal.environment.query(
+                {}, sort_key='created_at', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # Wrong key and order being passed in
         failed = False
         try:
-            _ = self.dal.environment.query({},
-                sort_key='wrong_key',
-                sort_order='wrong_order')
+            _ = self.dal.environment.query(
+                {}, sort_key='wrong_key', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # wrong key and right order being passed in
-        expected_items = self.dal.environment.query({},
-            sort_key='created_at',
-            sort_order='ascending')
-        items = self.dal.environment.query({},
-            sort_key='wrong_key',
-            sort_order='ascending')
+        expected_items = self.dal.environment.query(
+            {}, sort_key='created_at', sort_order='ascending')
+        items = self.dal.environment.query(
+            {}, sort_key='wrong_key', sort_order='ascending')
         expected_ids = [item.id for item in expected_items]
         ids = [item.id for item in items]
         assert set(expected_ids) == set(ids)

diff --git a/datmo/core/storage/local/tests/test_dal_file_collection.py b/datmo/core/storage/local/tests/test_dal_file_collection.py
@@ -140,47 +140,41 @@ def test_query_file_collections_multiple(self):
         file_collection_3 = self.dal.file_collection.create(
             FileCollection(self.file_collection_input_dict))
 
-        results = self.dal.file_collection.query({},
-            sort_key="created_at",
-            sort_order="ascending")
+        results = self.dal.file_collection.query(
+            {}, sort_key="created_at", sort_order="ascending")
         assert len(results) == 3
         assert results[0].created_at == file_collection_1.created_at
         assert results[1].created_at == file_collection_2.created_at
 
-        results = self.dal.file_collection.query({},
-            sort_key="created_at",
-            sort_order="descending")
+        results = self.dal.file_collection.query(
+            {}, sort_key="created_at", sort_order="descending")
         assert len(results) == 3
         assert results[0].created_at == file_collection_3.created_at
         assert results[1].created_at == file_collection_2.created_at
 
         # Wrong order being passed in
         failed = False
         try:
-            _ = self.dal.file_collection.query({},
-                sort_key='created_at',
-                sort_order='wrong_order')
+            _ = self.dal.file_collection.query(
+                {}, sort_key='created_at', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # Wrong key and order being passed in
         failed = False
         try:
-            _ = self.dal.file_collection.query({},
-                sort_key='wrong_key',
-                sort_order='wrong_order')
+            _ = self.dal.file_collection.query(
+                {}, sort_key='wrong_key', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # wrong key and right order being passed in
-        expected_items = self.dal.file_collection.query({},
-            sort_key='created_at',
-            sort_order='ascending')
-        items = self.dal.file_collection.query({},
-            sort_key='wrong_key',
-            sort_order='ascending')
+        expected_items = self.dal.file_collection.query(
+            {}, sort_key='created_at', sort_order='ascending')
+        items = self.dal.file_collection.query(
+            {}, sort_key='wrong_key', sort_order='ascending')
         expected_ids = [item.id for item in expected_items]
         ids = [item.id for item in items]
         assert set(expected_ids) == set(ids)

diff --git a/datmo/core/storage/local/tests/test_dal_model.py b/datmo/core/storage/local/tests/test_dal_model.py
@@ -135,47 +135,41 @@ def test_query_models_multiple(self):
         model_2 = self.dal.model.create(Model(self.model_input_dict))
         model_3 = self.dal.model.create(Model(self.model_input_dict))
 
-        results = self.dal.model.query({},
-            sort_key="created_at",
-            sort_order="ascending")
+        results = self.dal.model.query(
+            {}, sort_key="created_at", sort_order="ascending")
         assert len(results) == 3
         assert results[0].created_at == model_1.created_at
         assert results[1].created_at == model_2.created_at
 
-        results = self.dal.model.query({},
-            sort_key="created_at",
-            sort_order="descending")
+        results = self.dal.model.query(
+            {}, sort_key="created_at", sort_order="descending")
         assert len(results) == 3
         assert results[0].created_at == model_3.created_at
         assert results[1].created_at == model_2.created_at
 
         # Wrong order being passed in
         failed = False
         try:
-            _ = self.dal.model.query({},
-                sort_key='created_at',
-                sort_order='wrong_order')
+            _ = self.dal.model.query(
+                {}, sort_key='created_at', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # Wrong key and order being passed in
         failed = False
         try:
-            _ = self.dal.model.query({},
-                sort_key='wrong_key',
-                sort_order='wrong_order')
+            _ = self.dal.model.query(
+                {}, sort_key='wrong_key', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
 
         # wrong key and right order being passed in
-        expected_items = self.dal.model.query({},
-            sort_key='created_at',
-            sort_order='ascending')
-        items = self.dal.model.query({},
-            sort_key='wrong_key',
-            sort_order='ascending')
+        expected_items = self.dal.model.query(
+            {}, sort_key='created_at', sort_order='ascending')
+        items = self.dal.model.query(
+            {}, sort_key='wrong_key', sort_order='ascending')
         expected_ids = [item.id for item in expected_items]
         ids = [item.id for item in items]
         assert set(expected_ids) == set(ids)

diff --git a/datmo/core/storage/local/tests/test_dal_user.py b/datmo/core/storage/local/tests/test_dal_user.py
@@ -126,9 +126,7 @@ def test_query_users_multiple(self):
         failed = False
         try:
             _ = self.dal.user.query(
-                {},
-                sort_key='created_at',
-                sort_order='wrong_order')
+                {}, sort_key='created_at', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed
@@ -137,9 +135,7 @@ def test_query_users_multiple(self):
         failed = False
         try:
             _ = self.dal.user.query(
-                {},
-                sort_key='wrong_key',
-                sort_order='wrong_order')
+                {}, sort_key='wrong_key', sort_order='wrong_order')
         except InvalidArgumentType:
             failed = True
         assert failed