Merge pull request #11767 from internetarchive/pytest-v9-strict

updates for pytest v9

Author: RayBB

openlibrary/catalog/add_book/tests/test_match.py

@@ -73,7 +73,6 @@ def test_normalize(title, normalized):
 
 
 mk_norm_conversions = [
-    ("Hello I'm a  title.", "helloi'matitle"),
     ("Hello I'm a  title.", "helloi'matitle"),
     ('Forgotten Titles: A Novel.', 'forgottentitlesanovel'),
     ('Kitāb Yatīmat ud-Dahr', 'kitābyatīmatuddahr'),

openlibrary/tests/catalog/test_utils.py

@@ -206,20 +206,20 @@ def test_remove_trailing_dot():
 @pytest.mark.parametrize(
     ('year', 'expected'),
     [
-        ('1999-01', 1999),
-        ('1999', 1999),
-        ('01-1999', 1999),
-        ('May 5, 1999', 1999),
-        ('May 5, 19999', None),
-        ('1999-01-01', 1999),
-        ('1999/1/1', 1999),
-        ('01-01-1999', 1999),
-        ('1/1/1999', 1999),
-        ('199', None),
-        ('19990101', None),
-        (None, None),
-        (1999, 1999),
-        (19999, None),
+        pytest.param('1999-01', 1999, id="ISO_month"),
+        pytest.param('1999', 1999, id="plain_year_str"),
+        pytest.param('01-1999', 1999, id="US_month_year"),
+        pytest.param('May 5, 1999', 1999, id="full_date_text"),
+        pytest.param('May 5, 19999', None, id="out_of_range_year"),
+        pytest.param('1999-01-01', 1999, id="ISO_full_date"),
+        pytest.param('1999/1/1', 1999, id="slashed_date"),
+        pytest.param('01-01-1999', 1999, id="dashed_date_euro_us"),
+        pytest.param('1/1/1999', 1999, id="shorthand_date"),
+        pytest.param('199', None, id="too_short_year"),
+        pytest.param('19990101', None, id="unformatted_string"),
+        pytest.param(None, None, id="null_input"),
+        pytest.param(1999, 1999, id="integer_input"),
+        pytest.param(19999, None, id="integer_out_of_range"),
     ],
 )
 def test_publication_year(year, expected) -> None:

openlibrary/tests/fastapi/test_search.py

@@ -351,10 +351,6 @@ def test_openapi_contains_search_endpoint(self, client):
         assert 'paths' in openapi
         assert '/search.json' in openapi['paths']
 
-    @pytest.mark.xfail(
-        reason="FastAPI doesn't propagate descriptions from Pydantic models used via Depends(). "
-        "See: https://github.com/tiangolo/fastapi/discussions/10410"
-    )
     def test_openapi_parameters_have_descriptions(self, client):
         """Test that query parameters in the OpenAPI spec have descriptions.
 

openlibrary/utils/tests/test_ddc.py

@@ -10,12 +10,12 @@
 # Src: https://www.oclc.org/bibformats/en/0xx/082.html
 TESTS_FROM_OCLC = [
     ("370.19'342", ['370.19342'], "Segmentation (prime) marks"),
-    ("370.19/342", ['370.19342'], "Segmentation (prime) marks"),
+    ("370.19/342", ['370.19342'], "Segmentation (prime) marks 2"),
     ("j574", ['j574', '574'], "Juvenile works."),
     ("[E]", ['[E]'], "Juvenile works with [E]"),
     ("[Fic]", ['[Fic]'], "Juvenile works with [Fic]."),
     ("658.404 92", ['658.404 92'], "Dewey numbers followed by 92 or 920."),
-    ("658.404 920", ['658.404 920'], "Dewey numbers followed by 92 or 920."),
+    ("658.404 920", ['658.404 920'], "Dewey numbers followed by 92 or 920. 2"),
     ("942.082 [B]", ['942.082 B'], "Uppercase B in post-1971 numbers."),
     (
         "*657.6",
@@ -27,10 +27,10 @@
         "*735.29 735.42",
         ['735.29*', '735.42'],
         "LC assigned Dewey numbers according to both the 14th and the 15th editions of "
-        "the Dewey schedules.",
+        "the Dewey schedules. 2",
     ),
     ("081s", ['081 s'], "Series numbers."),
-    ("081 s", ['081 s'], "Series numbers."),
+    ("081 s", ['081 s'], "Series numbers. 2"),
     (
         "(015.73)",
         ['015.73 s'],
@@ -39,17 +39,17 @@
     (
         "015.73 s",
         ['015.73 s'],
-        "Parentheses indicating Dewey numbers assigned to a series.",
+        "Parentheses indicating Dewey numbers assigned to a series. 2",
     ),
     (
         "(015.73) 015.791",
         ['015.73 s', '015.791'],
         "Two Dewey numbers: one in parentheses, one not.",
     ),
     ("-222.14", ['-222.14'], "Dewey numbers with minus signs."),
-    ("-222.14 (927.5)", ['-222.14', '927.5 s'], "Dewey numbers with minus signs."),
+    ("-222.14 (927.5)", ['-222.14', '927.5 s'], "Dewey numbers with minus signs. 2"),
     ("[320.9777]", ['320.9777'], "Dewey numbers in brackets."),
-    ("[016.3584] 012", ['016.3584'], "Dewey numbers in brackets."),
+    ("[016.3584] 012", ['016.3584'], "Dewey numbers in brackets. 2"),
     (
         "081s [370.19'342]",
         ['081 s', '370.19342'],
@@ -60,8 +60,8 @@
 TESTS = [
     ('123', ['123'], 'whole number'),
     ('1', ['001'], 'whole number padding'),
-    ('hello world!', [], 'junk'),
-    ('978123412341', [], 'junk'),
+    ('hello world!', [], 'junk text'),
+    ('978123412341', [], 'junk isbn'),
     (
         '338.9/009171/7 019',
         ['338.90091717'],
@@ -136,7 +136,7 @@ def test_normalize_ddc_prefix(prefix, normed, name):
 
 RANGE_TESTS = [
     (['0', '3'], ['000', '003'], 'Single numbers'),
-    (['100', '300'], ['100', '300'], 'Single numbers'),
+    (['100', '300'], ['100', '300'], 'Bigger single numbers'),
     (['100', '*'], ['100', '*'], 'Star'),
 ]
 

openlibrary/utils/tests/test_lcc.py

@@ -43,28 +43,26 @@ def test_to_short_lcc(sortable_lcc, raw_lcc, short_lcc, name):
 
 
 INVALID_TESTS = [
-    ('6113 .136', 'dewey decimal'),
-    ('9608 BOOK NOT YET IN LC', 'noise'),
-    ('#M8184', 'hash prefixed'),
-    ('', 'empty'),
-    ('MLCS 92/14990', 'too much class'),
-    ('PZ123.234.234', 'too much decimal'),
-    # The following are "real world" data from open library
-    ('IN PROCESS', 'noise'),
-    ('African Section Pamphlet Coll', 'real ol data'),
-    ('Microfilm 99/20', 'real ol data'),
-    ('Microfilm 61948 E', 'real ol data'),
-    ('Microfiche 92/80965 (G)', 'real ol data'),
-    ('MLCSN+', 'real ol data'),
-    ('UNCLASSIFIED 809 (S)', 'real ol data'),
-    ('CPB Box no. 1516 vol. 17', 'CPB box number'),
+    pytest.param('6113 .136', id='dewey_decimal'),
+    pytest.param('9608 BOOK NOT YET IN LC', id='noise_lc_missing'),
+    pytest.param('#M8184', id='hash_prefixed'),
+    pytest.param('', id='empty_string'),
+    pytest.param('MLCS 92/14990', id='excessive_class_info'),
+    pytest.param('PZ123.234.234', id='too_many_decimals'),
+    # "Real world" data from Open Library
+    pytest.param('IN PROCESS', id='noise_in_process'),
+    pytest.param('African Section Pamphlet Coll', id='ol_african_section'),
+    pytest.param('Microfilm 99/20', id='ol_microfilm_99_20'),
+    pytest.param('Microfilm 61948 E', id='ol_microfilm_61948'),
+    pytest.param('Microfiche 92/80965 (G)', id='ol_microfiche_92'),
+    pytest.param('MLCSN+', id='ol_mlcsn_plus'),
+    pytest.param('UNCLASSIFIED 809 (S)', id='ol_unclassified_809'),
+    pytest.param('CPB Box no. 1516 vol. 17', id='cpb_box_number'),
 ]
 
 
-@pytest.mark.parametrize(
-    ('text', 'name'), INVALID_TESTS, ids=[t[-1] for t in INVALID_TESTS]
-)
-def test_invalid_lccs(text, name):
+@pytest.mark.parametrize('text', INVALID_TESTS)
+def test_invalid_lccs(text):
     assert short_lcc_to_sortable_lcc(text) is None
 
 
@@ -107,14 +105,14 @@ def test_wagner_2019_to_short_lcc(sortable_lcc, short_lcc, name):
     ('A', 'A', 'Single letter'),
     ('ADC', 'ADC', 'multi letter'),
     ('A5', 'A--0005', 'Alphanum'),
-    ('A5.00', 'A--0005.00', 'Alphanum'),
+    ('A5.00', 'A--0005.00', 'Alphanum 2'),
     ('A10', 'A--0010', 'Alphanum trailing 0'),
     ('A10.5', 'A--0010.5', 'Alphanum with decimal'),
     ('A10.', 'A--0010', 'Alphanum with trailing decimal'),
     ('A10.C', 'A--0010.00000000.C', 'Alphanum with partial cutter'),
     ('F349.N2 A77', 'F--0349.00000000.N2 A77', '2 cutters'),
     ('123', None, 'Invalid returns None'),
-    ('*B55', None, 'Invalid returns None'),
+    ('*B55', None, 'Invalid also returns None'),
 ]
 
 

pyproject.toml

@@ -37,6 +37,7 @@ module = ["openlibrary.core.wikidata", "openlibrary.core.yearly_reading_goals"]
 disallow_untyped_defs = true
 
 [tool.pytest.ini_options]
+strict = true
 asyncio_mode = "strict"
 asyncio_default_fixture_loop_scope = "function"
 filterwarnings = [

scripts/tests/test_isbndb.py

@@ -124,12 +124,12 @@ def test_isbndb_get_languages(language, expected, get_isbndb_data):
 @pytest.mark.parametrize(
     ('year', 'expected'),
     [
-        (2000, "2000"),
-        ("2000", "2000"),
-        ("December 2000", "2000"),
-        ("-", None),
-        ("123", None),
-        (None, None),
+        pytest.param(2000, "2000", id="integer_year"),
+        pytest.param("2000", "2000", id="string_year"),
+        pytest.param("December 2000", "2000", id="full_date_string"),
+        pytest.param("-", None, id="invalid_placeholder"),
+        pytest.param("123", None, id="too_short_string"),
+        pytest.param(None, None, id="null_input"),
     ],
 )
 def test_isbndb_get_year(year, expected, get_isbndb_data):