From 1ffae095fdcbe78cf0c3eae21c9725ef9b1aacc1 Mon Sep 17 00:00:00 2001 From: Martin Czygan Date: Wed, 14 Apr 2021 23:00:33 +0200 Subject: fix imports and formatting --- tests/test_matching.py | 17 ++++++++++++----- tests/test_utils.py | 17 ++++++++++++++--- 2 files changed, 26 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/test_matching.py b/tests/test_matching.py index 8d70d15..1702792 100644 --- a/tests/test_matching.py +++ b/tests/test_matching.py @@ -1,15 +1,22 @@ -from fuzzycat.matching import anything_to_entity, match_release_fuzzy -from fuzzycat.entities import entity_from_dict -from fatcat_openapi_client import ReleaseEntity -import pytest -import elasticsearch import logging +import warnings + +import elasticsearch +import pytest +import requests from dynaconf import Dynaconf +from fatcat_openapi_client import ReleaseEntity + +from fuzzycat.entities import entity_from_dict +from fuzzycat.matching import anything_to_entity, match_release_fuzzy + +warnings.filterwarnings("ignore") # InsecureRequestWarning: Unverified HTTPS request is being made to host ... logger = logging.getLogger('test_matching') logger.setLevel(logging.DEBUG) settings = Dynaconf(envvar_prefix="FUZZYCAT") +# ad-hoc override search server with: FUZZYCAT_FATCAT_SEARCH_URL=localhost:9200 pytest ... FATCAT_SEARCH_URL = settings.get("FATCAT_SEARCH_URL", "https://search.fatcat.wiki:443") diff --git a/tests/test_utils.py b/tests/test_utils.py index 24be9d1..381c44e 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -99,11 +99,22 @@ def test_zstdlines(): with open(fn) as f: assert [s.strip() for s in f.readlines()] == list(zstdlines(zfn)) + def test_es_compat_hits_total(): cases = ( - ({"hits": {"total": 6}}, 6), - ({"hits": {"total": {"value": 7, "relation": "eq"}}}, 7), + ({ + "hits": { + "total": 6 + } + }, 6), + ({ + "hits": { + "total": { + "value": 7, + "relation": "eq" + } + } + }, 7), ) for r, expected in cases: assert es_compat_hits_total(r) == expected - -- cgit v1.2.3