Commit5be0383

committed

Merge pull request#251 from gsnedders/fix_test_warnings

Avoid TestData throwing a warning in test_encoding.py; r=nobody!

2 parents176651a +366ed48 commit5be0383Copy full SHA for 5be0383

File tree

+18

-3

lines changed

+18

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`exceptAttributeError:`
`9`	`9`	`unittest.TestCase.assertEqual=unittest.TestCase.assertEquals`
`10`	`10`
`11`		`-from .supportimportget_data_files,TestData,test_dir,errorMessage`
	`11`	`+from .supportimportget_data_files,test_dir,errorMessage,TestDataas_TestData`
`12`	`12`	`fromhtml5libimportHTMLParser,inputstream`
`13`	`13`
`14`	`14`
`@@ -56,7 +56,7 @@ def runPreScanEncodingTest(data, encoding):`
`56`	`56`
`57`	`57`	`deftest_encoding():`
`58`	`58`	`forfilenameinget_data_files("encoding"):`
`59`		`-tests=TestData(filename,b"data",encoding=None)`
	`59`	`+tests=_TestData(filename,b"data",encoding=None)`
`60`	`60`	`foridx,testinenumerate(tests):`
`61`	`61`	`yield (runParserEncodingTest,test[b'data'],test[b'encoding'])`
`62`	`62`	`yield (runPreScanEncodingTest,test[b'data'],test[b'encoding'])`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,17 @@`
`1`	`1`	`[pytest]`
`2`		`-addopts = -rXw -p no:doctest`
	`2`	`+# Output fails, errors, xpass, and warnings; ignore doctest; make warnings errors`
	`3`	`+addopts = -rfEXw -p no:doctest --strict`
	`4`	`+`
	`5`	`+# Make xpass results be considered fail`
	`6`	`+xfail_strict = true`
	`7`	`+`
	`8`	`+# Document our markers`
	`9`	`+markers =`
	`10`	`+ DOM: mark a test as a DOM tree test`
	`11`	`+ ElementTree: mark a test as a ElementTree tree test`
	`12`	`+ cElementTree: mark a test as a cElementTree tree test`
	`13`	`+ lxml: mark a test as a lxml tree test`
	`14`	`+ genshi: mark a test as a genshi tree test`
	`15`	`+ parser: mark a test as a parser test`
	`16`	`+ namespaced: mark a test as a namespaced parser test`
	`17`	`+ treewalker: mark a test as a treewalker test`

Comments

(0)