Commitc66d41e

committed

Use the nose skip plugin to actually properly skip tests.

1 parent5ef00b1 commitc66d41eCopy full SHA for c66d41e

File tree

+16

-6

lines changed

+16

-6

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`importglob`
`7`	`7`	`importxml.sax.handler`
`8`	`8`
	`9`	`+fromnose.plugins.skipimportSkipTest`
	`10`	`+`
`9`	`11`	`base_path=os.path.split(__file__)[0]`
`10`	`12`
`11`	`13`	`test_dir=os.path.join(base_path,'testdata')`
`@@ -182,6 +184,8 @@ def xfail(test):`
`182`	`184`	`deft(args,*kwargs):`
`183`	`185`	`try:`
`184`	`186`	`test(*args)`
	`187`	`+exceptSkipTest:`
	`188`	`+raise`
`185`	`189`	`except:`
`186`	`190`	`return`
`187`	`191`	`else:`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`exceptAttributeError:`
`9`	`9`	`unittest.TestCase.assertEqual=unittest.TestCase.assertEquals`
`10`	`10`
	`11`	`+fromnose.plugins.skipimportSkipTest`
	`12`	`+`
`11`	`13`	`from .supportimportget_data_files,TestData,test_dir,errorMessage`
`12`	`14`	`fromhtml5libimportHTMLParser,inputstream`
`13`	`15`
`@@ -41,7 +43,7 @@ def runPreScanEncodingTest(data, encoding):`
`41`	`43`
`42`	`44`	`# Very crude way to ignore irrelevant tests`
`43`	`45`	`iflen(data)>stream.numBytesMeta:`
`44`		`-return`
	`46`	`+raiseSkipTest()`
`45`	`47`
`46`	`48`	`assertencoding==stream.charEncoding[0],errorMessage(data,encoding,stream.charEncoding[0])`
`47`	`49`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`warnings.simplefilter("error")`
`10`	`10`
	`11`	`+fromnose.plugins.skipimportSkipTest`
	`12`	`+`
`11`	`13`	`from .supportimportget_data_files`
`12`	`14`	`from .supportimportTestData,convert,convertExpected,treeTypes`
`13`	`15`	`from .supportimportxfail`
`@@ -30,7 +32,7 @@ def runParserTest(innerHTML, input, expected, errors, treeClass,`
`30`	`32`	`namespaceHTMLElements,scriptingDisabled):`
`31`	`33`	`ifscriptingDisabled:`
`32`	`34`	`# We don't support the scripting disabled case!`
`33`		`-return`
	`35`	`+raiseSkipTest()`
`34`	`36`
`35`	`37`	`withwarnings.catch_warnings(record=True)ascaughtWarnings:`
`36`	`38`	`warnings.simplefilter("always")`
`@@ -51,7 +53,7 @@ def runParserTest(innerHTML, input, expected, errors, treeClass,`
`51`	`53`	`ifnotissubclass(x.category,constants.DataLossWarning)]`
`52`	`54`	`assertlen(otherWarnings)==0, [(x.category,x.message)forxinotherWarnings]`
`53`	`55`	`iflen(caughtWarnings):`
`54`		`-return`
	`56`	`+raiseSkipTest()`
`55`	`57`
`56`	`58`	`output=convertTreeDump(p.tree.testSerializer(document))`
`57`	`59`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`exceptAttributeError:`
`12`	`12`	`unittest.TestCase.assertEqual=unittest.TestCase.assertEquals`
`13`	`13`
	`14`	`+fromnose.plugins.skipimportSkipTest`
	`15`	`+`
`14`	`16`	`from .supportimportget_data_files,TestData,convertExpected,xfail`
`15`	`17`
`16`	`18`	`fromhtml5libimporthtml5parser,treewalkers,treebuilders,constants`
`@@ -253,7 +255,7 @@ def test_all_tokens(self):`
`253`	`255`	`defrunTreewalkerTest(innerHTML,input,expected,errors,treeClass,scriptingDisabled):`
`254`	`256`	`ifscriptingDisabled:`
`255`	`257`	`# We don't support the scripting disabled case!`
`256`		`-return`
	`258`	`+raiseSkipTest()`
`257`	`259`
`258`	`260`	`warnings.resetwarnings()`
`259`	`261`	`warnings.simplefilter("error")`
`@@ -265,7 +267,7 @@ def runTreewalkerTest(innerHTML, input, expected, errors, treeClass, scriptingDi`
`265`	`267`	`document=p.parse(input)`
`266`	`268`	`exceptconstants.DataLossWarning:`
`267`	`269`	`# Ignore testcases we know we don't pass`
`268`		`-return`
	`270`	`+raiseSkipTest()`
`269`	`271`
`270`	`272`	`document=treeClass.get("adapter",lambdax:x)(document)`
`271`	`273`	`try:`
`@@ -282,7 +284,7 @@ def runTreewalkerTest(innerHTML, input, expected, errors, treeClass, scriptingDi`
`282`	`284`	`"","Diff:",diff,`
`283`	`285`	`])`
`284`	`286`	`exceptNotImplementedError:`
`285`		`-pass# Amnesty for those that confess...`
	`287`	`+raiseSkipTest()# Amnesty for those that confess...`
`286`	`288`
`287`	`289`
`288`	`290`	`@xfail`

Comments

(0)