Support pytest 4 #429

mcepl · 2019-11-01T11:23:43Z

Rebase of #414 by @hroncok on the top of the current master, and two small nits fixed.

hugovk

Please could you fix the flake8 errors?

./html5lib/tests/test_sanitizer.py:71:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:72:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:75:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:76:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:79:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:80:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:83:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:84:20: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:97:16: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:98:16: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:105:16: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:106:16: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:114:16: E128 continuation line under-indented for visual indent
./html5lib/tests/test_sanitizer.py:115:16: E128 continuation line under-indented for visual indent

mcepl · 2019-11-08T14:28:25Z

Better?

hugovk · 2019-11-08T14:52:44Z

Good, thanks! Flake8 now passes on Travis CI.

requirements-test.txt

codecov-io · 2019-11-08T15:17:31Z

Codecov Report

Merging #429 into master will decrease coverage by 1.82%.
The diff coverage is 71.42%.

@@            Coverage Diff             @@
##           master     #429      +/-   ##
==========================================
- Coverage   90.52%   88.69%   -1.83%     
==========================================
  Files          50       50              
  Lines        6973     6952      -21     
  Branches     1328     1308      -20     
==========================================
- Hits         6312     6166     -146     
- Misses        502      603     +101     
- Partials      159      183      +24

Impacted Files	Coverage Δ
html5lib/tests/test_stream.py	`93.82% <ø> (-5.06%)`	⬇️
html5lib/tests/test_serializer.py	`92.75% <100%> (ø)`	⬆️
html5lib/tests/test_treewalkers.py	`97.05% <100%> (ø)`	⬆️
html5lib/tests/test_encoding.py	`75% <33.33%> (-25%)`	⬇️
html5lib/tests/test_sanitizer.py	`94.59% <77.77%> (ø)`	⬆️
html5lib/_inputstream.py	`74.32% <0%> (-17.6%)`	⬇️
html5lib/tests/test_meta.py	`88% <0%> (-12%)`	⬇️
html5lib/_utils.py	`78.12% <0%> (-6.25%)`	⬇️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update af19281...29bb168. Read the comment docs.

felixonmars · 2019-11-20T05:40:11Z

It fails here with pytest 5.2.4, perhaps pytest 5 changed again?

I changed the line

mark=pytest.mark.skipif(sys.maxunicode == 0xFFFF,

to

marks=pytest.mark.skipif(sys.maxunicode == 0xFFFF,

and it works fine now. Would you consider to include the change too?

The error:

==================================== ERRORS ====================================
________________ ERROR collecting html5lib/tests/test_stream.py ________________
html5lib/tests/test_stream.py:311: in <module>
    ???
/usr/lib/python3.8/site-packages/_pytest/mark/__init__.py:33: in param
    return ParameterSet.param(*values, **kw)
E   TypeError: param() got an unexpected keyword argument 'mark'
=============================== warnings summary ===============================
html5lib/_trie/_base.py:3
  /build/python-html5lib/src/html5lib-python-1.0.1/html5lib/_trie/_base.py:3: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working
    from collections import Mapping

html5lib/treebuilders/dom.py:4
  /build/python-html5lib/src/html5lib-python-1.0.1/html5lib/treebuilders/dom.py:4: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working
    from collections import MutableMapping

-- Docs: https://docs.pytest.org/en/latest/warnings.html
=========================== short test summary info ============================
FAILED html5lib/tests/test_stream.py - TypeError: param() got an unexpected k...
!!!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!!!
========================= 2 warnings, 1 error in 0.48s =========================

jdufresne · 2020-01-05T21:00:15Z

Would you consider to include the change too?

That change makes sense to me. Can you go ahead with that?

mcepl · 2020-01-06T10:12:15Z

Not sure, what’s wrong now. Is it some bug inside of pytest? Do I do something wrong?

Locally, it passes without any problem both with pytest 4.6.6 and pytest 5.2.4.
.

felixonmars · 2020-01-06T17:06:27Z

The original non-decorator pytest.mark.skipif line looks wrong to me from the beginning. It should be a decorated @pytest.mark.skipif in the next line IMHO.

mcepl · 2020-01-06T17:58:27Z

The original non-decorator pytest.mark.skipif line looks wrong to me from the beginning. It should be a decorated @pytest.mark.skipif in the next line IMHO.

OK, I am too stupid and too sleepy, right now. Could I get a proper diff of what I should do, please?

gsnedders

The majority of these functions that yield tests all yield the same test function, right? Can we not just rename those functions, rename the functions they call, and call the existing functions with @pytest.mark.parametrize?

i.e., def test_encoding becomes def generate_encoding, the first argument from the yields is dropped, and then we end up with:

@pytest.mark.parameterize("data, encoding", generate_encoding())
def test_parser_encoding(data, encoding)

(renamed from runParserEncodingTest?)

gsnedders · 2020-02-26T01:31:00Z

html5lib/tests/test_encoding.py

@@ -95,12 +95,13 @@ def runPreScanEncodingTest(data, encoding):
    assert encoding == stream.charEncoding[0].name, errorMessage(data, encoding, stream.charEncoding[0].name)


+@pytest.mark.skip(reason="broken under pytest4")


This will need to be fixed before we can move to 4.x

html5lib/tests/test_sanitizer.py

html5lib/tests/test_stream.py

gsnedders · 2020-02-26T01:33:28Z

html5lib/tests/test_treewalkers.py

@@ -99,7 +99,7 @@ def test_treewalker_six_mix():

    for tree in sorted(treeTypes.items()):
        for intext, attrs, expected in sm_tests:
-            yield runTreewalkerEditTest, intext, expected, attrs, tree
+            runTreewalkerEditTest(intext, expected, attrs, tree)


As above, we do want these as separate tests.

tox.ini

See html5lib#429 for upgrading to >= 4

See #429 for upgrading to >= 4

Fixes #411

gsnedders · 2020-06-09T00:43:41Z

Fixed by #497

hugovk suggested changes Nov 8, 2019

View reviewed changes

hugovk mentioned this pull request Nov 8, 2019

Support pytest 4 #414

Closed

hugovk reviewed Nov 8, 2019

View reviewed changes

requirements-test.txt Outdated Show resolved Hide resolved

gsnedders mentioned this pull request Feb 26, 2020

Fix Pytest4.x compatibility error #420

Merged

gsnedders reviewed Feb 26, 2020

View reviewed changes

gsnedders mentioned this pull request Feb 26, 2020

Bump pytest from 3.2.5 to 5.3.5 #441

Closed

This was referenced Feb 26, 2020

Drop six 1.9 support #370

Closed

1.0.1: trst suite is failing #451

Closed

gsnedders added a commit to gsnedders/html5lib-python that referenced this pull request Feb 27, 2020

Update pytest to 3.10.1 (the last < 4 release)

32db632

See html5lib#429 for upgrading to >= 4

gsnedders added a commit to gsnedders/html5lib-python that referenced this pull request Feb 27, 2020

Update pytest to 3.10.1 (the last < 4 release)

a799781

See html5lib#429 for upgrading to >= 4

gsnedders added a commit that referenced this pull request Feb 27, 2020

Update pytest to 3.10.1 (the last < 4 release)

05b73ef

See #429 for upgrading to >= 4

mcepl and others added 2 commits May 6, 2020 19:13

Fix the patch by Miro Hroncok

59e400f

Support pytest 4

39506b4

Fixes #411

gsnedders mentioned this pull request May 24, 2020

Update pytest #497

Merged

gsnedders closed this Jun 9, 2020

mcepl deleted the pytest4 branch June 9, 2020 09:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support pytest 4 #429

Support pytest 4 #429

mcepl commented Nov 1, 2019

hugovk left a comment

mcepl commented Nov 8, 2019

hugovk commented Nov 8, 2019

codecov-io commented Nov 8, 2019 •

edited

felixonmars commented Nov 20, 2019

jdufresne commented Jan 5, 2020

mcepl commented Jan 6, 2020 •

edited

felixonmars commented Jan 6, 2020

mcepl commented Jan 6, 2020

gsnedders left a comment

gsnedders Feb 26, 2020

gsnedders Feb 26, 2020

gsnedders commented Jun 9, 2020

		@@ -95,12 +95,13 @@ def runPreScanEncodingTest(data, encoding):
		assert encoding == stream.charEncoding[0].name, errorMessage(data, encoding, stream.charEncoding[0].name)


		@pytest.mark.skip(reason="broken under pytest4")

Support pytest 4 #429

Support pytest 4 #429

Conversation

mcepl commented Nov 1, 2019

hugovk left a comment

Choose a reason for hiding this comment

mcepl commented Nov 8, 2019

hugovk commented Nov 8, 2019

codecov-io commented Nov 8, 2019 • edited

Codecov Report

felixonmars commented Nov 20, 2019

jdufresne commented Jan 5, 2020

mcepl commented Jan 6, 2020 • edited

felixonmars commented Jan 6, 2020

mcepl commented Jan 6, 2020

gsnedders left a comment

Choose a reason for hiding this comment

gsnedders Feb 26, 2020

Choose a reason for hiding this comment

gsnedders Feb 26, 2020

Choose a reason for hiding this comment

gsnedders commented Jun 9, 2020

codecov-io commented Nov 8, 2019 •

edited

mcepl commented Jan 6, 2020 •

edited