update tests to pass ruff

kanedata · Oct 12, 2023 · 209edf1 · 209edf1
1 parent 3c207d3
commit 209edf1
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 18 deletions.
diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-python-3.10.9
+python-3.10.13
diff --git a/tests/blueprints/test_areas.py b/tests/blueprints/test_areas.py
@@ -1,6 +1,4 @@
-import html
 
-from tests.fixtures import client
 
 AREA_CODE = "S02000783"
 AREA_NAME = "Lower Bow & Larkfield, Fancy Farm, Mallard Bowl"

diff --git a/tests/blueprints/test_areatypes.py b/tests/blueprints/test_areatypes.py
@@ -1,6 +1,5 @@
 import html
 
-from tests.fixtures import client
 
 AREATYPE_CODE = "lsoa11"
 

diff --git a/tests/blueprints/test_extend.py b/tests/blueprints/test_extend.py
@@ -1,8 +1,6 @@
 import json
 from urllib.parse import urlencode
 
-from tests.fixtures import client
-
 
 def test_reconcile_spec(client):
     rv = client.get("/reconcile")
@@ -15,7 +13,12 @@ def test_reconcile_spec(client):
     # assert isinstance(spec.get("extend", {}).get("property_settings"), list)
     # assert "name" in spec.get("extend", {}).get("property_settings", [])[0]
     # assert "label" in spec.get("extend", {}).get("property_settings", [])[0]
-    # assert spec.get("extend", {}).get("property_settings", [])[0]["type"] in ["number", "text", "checkbox", "select"]
+    # assert spec.get(
+    #   "extend", {}
+    # ).get(
+    #   "property_settings",
+    #   []
+    # )[0]["type"] in ["number", "text", "checkbox", "select"]
 
 
 # def test_reconcile_properties(client):

diff --git a/tests/blueprints/test_index.py b/tests/blueprints/test_index.py
@@ -1,4 +1,3 @@
-from tests.fixtures import client
 
 
 def test_index(client):

diff --git a/tests/blueprints/test_points.py b/tests/blueprints/test_points.py
@@ -1,4 +1,3 @@
-from tests.fixtures import client
 
 
 def test_point_json(client):

diff --git a/tests/blueprints/test_postcodes.py b/tests/blueprints/test_postcodes.py
@@ -1,4 +1,3 @@
-from tests.fixtures import client
 
 
 def test_postcode_json(client):

diff --git a/tests/fixtures.py → tests/conftest.py b/tests/fixtures.py → tests/conftest.py
@@ -1,5 +1,4 @@
 import copy
-import io
 import json
 import os
 from contextlib import contextmanager

diff --git a/tests/controllers/test_controller.py b/tests/controllers/test_controller.py
@@ -1,5 +1,5 @@
 from findthatpostcode.controllers.controller import Controller
-from tests.fixtures import MockElasticsearch
+from tests.conftest import MockElasticsearch
 
 
 def test_controller_class():
@@ -27,7 +27,6 @@ def test_controller_class():
 
 
 def test_controller_fetch():
-
     es = MockElasticsearch()
 
     a = Controller.get_from_es(

diff --git a/tests/controllers/test_controller_areas.py b/tests/controllers/test_controller_areas.py
@@ -2,7 +2,7 @@
 
 from findthatpostcode.controllers.areas import Area, get_all_areas, search_areas
 from findthatpostcode.controllers.postcodes import Postcode
-from tests.fixtures import MockElasticsearch
+from tests.conftest import MockElasticsearch
 
 
 def test_area_class():

diff --git a/tests/controllers/test_controller_point.py b/tests/controllers/test_controller_point.py
@@ -1,5 +1,5 @@
 from findthatpostcode.controllers.points import Point
-from tests.fixtures import MockElasticsearch
+from tests.conftest import MockElasticsearch
 
 
 def test_point_class():
@@ -10,7 +10,6 @@ def test_point_class():
 
 
 def test_point_class_es():
-
     es = MockElasticsearch()
     a = Point.get_from_es((100, -100), es)
 

diff --git a/tests/controllers/test_controller_postcodes.py b/tests/controllers/test_controller_postcodes.py
@@ -1,5 +1,5 @@
 from findthatpostcode.controllers.postcodes import Postcode
-from tests.fixtures import MockElasticsearch
+from tests.conftest import MockElasticsearch
 
 
 def test_postcode_class():
@@ -10,7 +10,6 @@ def test_postcode_class():
 
 
 def test_postcode_class_es():
-
     es = MockElasticsearch()
     a = Postcode.get_from_es("EX36 4AT", es)