explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-08-02 11:20:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move to test util method

Browse Source
This commit is contained in:
Adriane Boyd 2023-01-27 11:02:31 +01:00
parent f4e98812fe
commit 431465befc
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spacy/tests/test_cli_app.py
View File

@ -1,10 +1,9 @@
import os import os
import re
from pathlib import Path from pathlib import Path
from typer.testing import CliRunner from typer.testing import CliRunner
from spacy.cli._util import app from spacy.cli._util import app
from .util import make_tempdir from .util import make_tempdir, assert_strings_equal_except_ws
def test_convert_auto(): def test_convert_auto():
@ -38,8 +37,7 @@ def test_benchmark_accuracy_alias():
# Verify that the `evaluate` alias works correctly. # Verify that the `evaluate` alias works correctly.
result_benchmark = CliRunner().invoke(app, ["benchmark", "accuracy", "--help"]) result_benchmark = CliRunner().invoke(app, ["benchmark", "accuracy", "--help"])
result_evaluate = CliRunner().invoke(app, ["evaluate", "--help"]) result_evaluate = CliRunner().invoke(app, ["evaluate", "--help"])
assert re.sub(r"\s+", " ", result_benchmark.stdout) == re.sub( assert_strings_equal_except_ws(
r"\s+", result_benchmark.stdout,
" ",
result_evaluate.stdout.replace("spacy evaluate", "spacy benchmark accuracy"), result_evaluate.stdout.replace("spacy evaluate", "spacy benchmark accuracy"),
) )

6
spacy/tests/util.py
View File

@ -1,6 +1,7 @@
import numpy import numpy
import tempfile import tempfile
import contextlib import contextlib
import re
import srsly import srsly
from spacy.tokens import Doc from spacy.tokens import Doc
from spacy.vocab import Vocab from spacy.vocab import Vocab
@ -95,3 +96,8 @@ def assert_packed_msg_equal(b1, b2):
for (k1, v1), (k2, v2) in zip(sorted(msg1.items()), sorted(msg2.items())): for (k1, v1), (k2, v2) in zip(sorted(msg1.items()), sorted(msg2.items())):
assert k1 == k2 assert k1 == k2
assert v1 == v2 assert v1 == v2
def assert_strings_equal_except_ws(s1, s2):
"""Assert that two strings are identical except for whitespace."""
assert re.sub(r"\s+", " ", s1) == re.sub(r"\s+", " ", s2)