From c219ae3301eedf37c62a1ed00cb8ac23bba33ce3 Mon Sep 17 00:00:00 2001
From: Mike Shoup <mike@shoup.io>
Date: Thu, 11 Jul 2019 21:16:51 -0600
Subject: [PATCH] Flake8 fixes for tests

---
 tests/conftest.py     |  4 +++-
 tests/test_auth.py    |  3 +--
 tests/test_couch.py   |  7 +++----
 tests/test_filters.py |  3 ++-
 tests/test_recipes.py |  6 +++---
 tests/test_styles.py  | 29 +++++++++++++++--------------
 6 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 52bd0c3..21043e4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -20,6 +20,7 @@ import pytest
 from humulus import create_app
 from humulus.couch import build_couch, get_couch, put_doc
 
+
 @pytest.fixture
 def app():
     dbname = 'test_{}'.format(str(uuid.uuid4()))
@@ -126,7 +127,8 @@ def app():
         })
 
         # Add a test style
-        put_doc({'$type': 'style',
+        put_doc({
+            '$type': 'style',
             '_id': '1A',
             'abv': {'high': '100', 'low': '0'},
             'appearance': 'Good looking',
diff --git a/tests/test_auth.py b/tests/test_auth.py
index 147b021..ed30b2c 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from flask import session
-
 
 def test_login(client, auth):
     # Test GET
@@ -43,6 +41,7 @@ def test_login(client, auth):
         assert session['logged_in']
         assert session.permanent
 
+
 def test_logout(client, auth):
     # Login
     auth.login()
diff --git a/tests/test_couch.py b/tests/test_couch.py
index d276125..33c8805 100644
--- a/tests/test_couch.py
+++ b/tests/test_couch.py
@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import uuid
 from pathlib import Path
 
-from humulus.couch import *
+from humulus.couch import put_doc, get_doc, update_doc, put_designs, get_view
 
 
 def test_put_doc(app):
@@ -73,7 +72,7 @@ def test_put_designs(app, monkeypatch):
 
     with app.app_context():
         # Test initial load of designs
-        monkeypatch.setattr(Path, 'parent', testpath/'assets/initial')
+        monkeypatch.setattr(Path, 'parent', testpath / 'assets/initial')
         put_designs()
 
         recipes = get_doc('_design/recipes')
@@ -86,7 +85,7 @@ def test_put_designs(app, monkeypatch):
         assert recipes['_rev'] == rev
 
         # Test that changes can be loaded
-        monkeypatch.setattr(Path, 'parent', testpath/'assets/changed')
+        monkeypatch.setattr(Path, 'parent', testpath / 'assets/changed')
         put_designs()
         recipes = get_doc('_design/recipes')
         assert 'by-date' in recipes['views']
diff --git a/tests/test_filters.py b/tests/test_filters.py
index b6928df..de6bbf7 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -14,7 +14,8 @@
 
 from decimal import Decimal
 
-from humulus.filters import *
+from humulus.filters import (recipe_abv, recipe_fg, recipe_ibu, sort_hops,
+                             recipe_ibu_ratio, recipe_og, recipe_srm, ferm_pct)
 from humulus.recipes import HopForm
 
 
diff --git a/tests/test_recipes.py b/tests/test_recipes.py
index 6b1a1fd..b1c69f1 100644
--- a/tests/test_recipes.py
+++ b/tests/test_recipes.py
@@ -16,7 +16,7 @@ import json
 from decimal import Decimal
 from io import BytesIO
 
-from humulus.couch import get_db, get_doc, put_doc
+from humulus.couch import get_doc
 from humulus.recipes import FermentableForm, HopForm, RecipeForm, YeastForm
 
 
@@ -41,7 +41,6 @@ def test_index(client):
         response.data
     )
 
-
     # Test sort by name descending
     response = client.get('/recipes/?descending=true&sort_by=name')
     assert (
@@ -119,6 +118,7 @@ def test_index(client):
         response.data
     )
 
+
 def test_create(client, app, auth):
     """Test success in creating a recipe document."""
     # Test GET without login
@@ -203,7 +203,7 @@ def test_update(client, app, auth):
                            query_string={'rev': ''}, data=doc)
     assert response.status_code == 302
     with client.session_transaction() as session:
-         flash_message = dict(session['_flashes']).pop('danger', None)
+        flash_message = dict(session['_flashes']).pop('danger', None)
     assert 'Update conflict' in flash_message
 
 
diff --git a/tests/test_styles.py b/tests/test_styles.py
index 4afc118..ca8d5ae 100644
--- a/tests/test_styles.py
+++ b/tests/test_styles.py
@@ -145,20 +145,21 @@ def test_import_styles(monkeypatch):
     monkeypatch.setattr('humulus.styles.put_doc', fake_put_doc)
 
     import_styles(None)
-    assert PutRecorder.doc == {'$type': 'style',
-            '_id': '1A',
-            'abv': {'high': '100', 'low': '0'},
-            'appearance': 'Good looking',
-            'aroma': 'Smelly',
-            'fg': {'high': '1.2', 'low': '1.0'},
-            'flavor': 'Good tasting',
-            'ibu': {'high': '100', 'low': '0'},
-            'impression': 'Refreshing',
-            'mouthfeel': 'Good feeling',
-            'name': 'Test Style',
-            'og': {'high': '1.2', 'low': '1.0'},
-            'srm': {'high': '100', 'low': '0'}
-        }
+    assert PutRecorder.doc == {
+        '$type': 'style',
+        '_id': '1A',
+        'abv': {'high': '100', 'low': '0'},
+        'appearance': 'Good looking',
+        'aroma': 'Smelly',
+        'fg': {'high': '1.2', 'low': '1.0'},
+        'flavor': 'Good tasting',
+        'ibu': {'high': '100', 'low': '0'},
+        'impression': 'Refreshing',
+        'mouthfeel': 'Good feeling',
+        'name': 'Test Style',
+        'og': {'high': '1.2', 'low': '1.0'},
+        'srm': {'high': '100', 'low': '0'}
+    }
 
     MockDB.db = {'1A': ''}
     PutRecorder.doc = None