From 645ce08f27069c5cad6e68e727f3effd96aaf1b7 Mon Sep 17 00:00:00 2001 From: Geoffrey Sneddon Date: Tue, 10 May 2016 10:56:09 -0700 Subject: [PATCH 1/2] Avoid TestData throwing a warning in test_encoding.py --- html5lib/tests/test_encoding.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py index 3837fe09..41b888c4 100644 --- a/html5lib/tests/test_encoding.py +++ b/html5lib/tests/test_encoding.py @@ -8,7 +8,7 @@ except AttributeError: unittest.TestCase.assertEqual = unittest.TestCase.assertEquals -from .support import get_data_files, TestData, test_dir, errorMessage +from .support import get_data_files, test_dir, errorMessage, TestData as _TestData from html5lib import HTMLParser, inputstream @@ -56,7 +56,7 @@ def runPreScanEncodingTest(data, encoding): def test_encoding(): for filename in get_data_files("encoding"): - tests = TestData(filename, b"data", encoding=None) + tests = _TestData(filename, b"data", encoding=None) for idx, test in enumerate(tests): yield (runParserEncodingTest, test[b'data'], test[b'encoding']) yield (runPreScanEncodingTest, test[b'data'], test[b'encoding']) From 366ed48da6d6550661cb6d9dcd8d4d1a0b44c645 Mon Sep 17 00:00:00 2001 From: Geoffrey Sneddon Date: Tue, 10 May 2016 10:58:37 -0700 Subject: [PATCH 2/2] Change py.test config. Make warnings errors, xpass fail, and document markers. --- pytest.ini | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index 6875cc7d..8824977a 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,17 @@ [pytest] -addopts = -rXw -p no:doctest +# Output fails, errors, xpass, and warnings; ignore doctest; make warnings errors +addopts = -rfEXw -p no:doctest --strict + +# Make xpass results be considered fail +xfail_strict = true + +# Document our markers +markers = + DOM: mark a test as a DOM tree test + ElementTree: mark a test as a ElementTree tree test + cElementTree: mark a test as a cElementTree tree test + lxml: mark a test as a lxml tree test + genshi: mark a test as a genshi tree test + parser: mark a test as a parser test + namespaced: mark a test as a namespaced parser test + treewalker: mark a test as a treewalker test