mirror of https://github.com/python/cpython
Move the test for confirmation that all nodes have been freed into the
driver code, so that each test gets this; it had been done inconsistently. Remove the lines that set the variables holding dom objects to None; not needed since the interpreter cleans up locals on function return.
This commit is contained in:
parent
5c2c6046eb
commit
ebe73025cd
|
@ -1,6 +1,8 @@
|
||||||
test_minidom
|
test_minidom
|
||||||
Test Succeeded testAAA
|
Test Succeeded testAAA
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAAB
|
Test Succeeded testAAB
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
|
@ -10,99 +12,155 @@ Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testAddAttr
|
Test Succeeded testAddAttr
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testAppendChild
|
Test Succeeded testAppendChild
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrListItem
|
Test Succeeded testAttrListItem
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrListItemNS
|
Test Succeeded testAttrListItemNS
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrListItems
|
Test Succeeded testAttrListItems
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrListKeys
|
Test Succeeded testAttrListKeys
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrListKeysNS
|
Test Succeeded testAttrListKeysNS
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrListLength
|
Test Succeeded testAttrListLength
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrListValues
|
Test Succeeded testAttrListValues
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrList__getitem__
|
Test Succeeded testAttrList__getitem__
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testAttrList__setitem__
|
Test Succeeded testAttrList__setitem__
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testAttributeRepr
|
Test Succeeded testAttributeRepr
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testChangeAttr
|
Test Succeeded testChangeAttr
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testChildNodes
|
Test Succeeded testChildNodes
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCloneAttributeDeep
|
Test Succeeded testCloneAttributeDeep
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCloneAttributeShallow
|
Test Succeeded testCloneAttributeShallow
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCloneDocumentDeep
|
Test Succeeded testCloneDocumentDeep
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCloneDocumentShallow
|
Test Succeeded testCloneDocumentShallow
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCloneElementDeep
|
Test Succeeded testCloneElementDeep
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCloneElementShallow
|
Test Succeeded testCloneElementShallow
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCloneElementShallowCopiesAttributes
|
Test Succeeded testCloneElementShallowCopiesAttributes
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testClonePIDeep
|
Test Succeeded testClonePIDeep
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testClonePIShallow
|
Test Succeeded testClonePIShallow
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testComment
|
Test Succeeded testComment
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCreatAttributeNS
|
Test Succeeded testCreatAttributeNS
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testCreateElementNS
|
Test Succeeded testCreateElementNS
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testDeleteAttr
|
Test Succeeded testDeleteAttr
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testDocumentElement
|
Test Succeeded testDocumentElement
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testElement
|
Test Succeeded testElement
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testElementReprAndStr
|
Test Succeeded testElementReprAndStr
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testFirstChild
|
Test Succeeded testFirstChild
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetAttrLength
|
Test Succeeded testGetAttrLength
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetAttrList
|
Test Succeeded testGetAttrList
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetAttrValues
|
Test Succeeded testGetAttrValues
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetAttribute
|
Test Succeeded testGetAttribute
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetAttributeNS
|
Test Succeeded testGetAttributeNS
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetAttributeNode
|
Test Succeeded testGetAttributeNode
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testGetElementsByTagName
|
Test Succeeded testGetElementsByTagName
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetElementsByTagNameNS
|
Test Succeeded testGetElementsByTagNameNS
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testGetEmptyNodeListFromElementsByTagNameNS
|
Test Succeeded testGetEmptyNodeListFromElementsByTagNameNS
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testHasChildNodes
|
Test Succeeded testHasChildNodes
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testInsertBefore
|
Test Succeeded testInsertBefore
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testNonZero
|
Test Succeeded testNonZero
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testParse
|
Test Succeeded testParse
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testParseAttributeNamespaces
|
Test Succeeded testParseAttributeNamespaces
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testParseAttributes
|
Test Succeeded testParseAttributes
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testParseElement
|
Test Succeeded testParseElement
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testParseElementNamespaces
|
Test Succeeded testParseElementNamespaces
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testParseFromFile
|
Test Succeeded testParseFromFile
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testParseProcessingInstructions
|
Test Succeeded testParseProcessingInstructions
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testParseString
|
Test Succeeded testParseString
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testProcessingInstruction
|
Test Succeeded testProcessingInstruction
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testProcessingInstructionRepr
|
Test Succeeded testProcessingInstructionRepr
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testRemoveAttr
|
Test Succeeded testRemoveAttr
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testRemoveAttrNS
|
Test Succeeded testRemoveAttrNS
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Passed Test
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testRemoveAttributeNode
|
Test Succeeded testRemoveAttributeNode
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testSetAttrValueandNodeValue
|
Test Succeeded testSetAttrValueandNodeValue
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testTextNodeRepr
|
Test Succeeded testTextNodeRepr
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testTextRepr
|
Test Succeeded testTextRepr
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testTooManyDocumentElements
|
Test Succeeded testTooManyDocumentElements
|
||||||
Passed Test
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testUnlink
|
Test Succeeded testUnlink
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
Test Succeeded testWriteText
|
Test Succeeded testWriteText
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
|
Passed Test
|
||||||
Passed Test
|
Passed Test
|
||||||
Test Succeeded testWriteXML
|
Test Succeeded testWriteXML
|
||||||
|
Passed assertion: len(Node.allnodes) == 0
|
||||||
All tests succeeded
|
All tests succeeded
|
||||||
|
|
|
@ -35,8 +35,6 @@ def testGetElementsByTagName( ):
|
||||||
confirm( dom.getElementsByTagName( "LI" )==\
|
confirm( dom.getElementsByTagName( "LI" )==\
|
||||||
dom.documentElement.getElementsByTagName( "LI" ) )
|
dom.documentElement.getElementsByTagName( "LI" ) )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
confirm (len( Node.allnodes )==0)
|
|
||||||
|
|
||||||
def testInsertBefore( ):
|
def testInsertBefore( ):
|
||||||
dom=parse( tstfile )
|
dom=parse( tstfile )
|
||||||
|
@ -50,9 +48,6 @@ def testInsertBefore( ):
|
||||||
#confirm( docel.childNodes[0].tet=="a" )
|
#confirm( docel.childNodes[0].tet=="a" )
|
||||||
#confirm( docel.childNodes[2].tet=="a" )
|
#confirm( docel.childNodes[2].tet=="a" )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
del dom
|
|
||||||
del docel
|
|
||||||
confirm( len( Node.allnodes )==0)
|
|
||||||
|
|
||||||
def testAppendChild():
|
def testAppendChild():
|
||||||
dom=parse( tstfile )
|
dom=parse( tstfile )
|
||||||
|
@ -60,8 +55,6 @@ def testAppendChild():
|
||||||
confirm( dom.documentElement.childNodes[-1].nodeName=="#comment" )
|
confirm( dom.documentElement.childNodes[-1].nodeName=="#comment" )
|
||||||
confirm( dom.documentElement.childNodes[-1].data=="Hello" )
|
confirm( dom.documentElement.childNodes[-1].data=="Hello" )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
confirm( len( Node.allnodes )==0 )
|
|
||||||
|
|
||||||
def testNonZero():
|
def testNonZero():
|
||||||
dom=parse( tstfile )
|
dom=parse( tstfile )
|
||||||
|
@ -69,29 +62,22 @@ def testNonZero():
|
||||||
dom.appendChild( dom.createComment( "foo" ) )
|
dom.appendChild( dom.createComment( "foo" ) )
|
||||||
confirm( not dom.childNodes[-1].childNodes )
|
confirm( not dom.childNodes[-1].childNodes )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
confirm( len( Node.allnodes )==0 )
|
|
||||||
|
|
||||||
def testUnlink():
|
def testUnlink():
|
||||||
dom=parse( tstfile )
|
dom=parse( tstfile )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
confirm( len( Node.allnodes )==0 )
|
|
||||||
|
|
||||||
def testElement():
|
def testElement():
|
||||||
dom=Document()
|
dom=Document()
|
||||||
dom.appendChild( dom.createElement( "abc" ) )
|
dom.appendChild( dom.createElement( "abc" ) )
|
||||||
confirm( dom.documentElement )
|
confirm( dom.documentElement )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
confirm( len( Node.allnodes )==0 )
|
|
||||||
|
|
||||||
def testAAA():
|
def testAAA():
|
||||||
dom=parseString( "<abc/>" )
|
dom=parseString( "<abc/>" )
|
||||||
el=dom.documentElement
|
el=dom.documentElement
|
||||||
el.setAttribute( "spam", "jam2" )
|
el.setAttribute( "spam", "jam2" )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
|
|
||||||
def testAAB():
|
def testAAB():
|
||||||
dom=parseString( "<abc/>" )
|
dom=parseString( "<abc/>" )
|
||||||
|
@ -99,7 +85,6 @@ def testAAB():
|
||||||
el.setAttribute( "spam", "jam" )
|
el.setAttribute( "spam", "jam" )
|
||||||
el.setAttribute( "spam", "jam2" )
|
el.setAttribute( "spam", "jam2" )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
|
|
||||||
def testAddAttr():
|
def testAddAttr():
|
||||||
dom=Document()
|
dom=Document()
|
||||||
|
@ -120,10 +105,7 @@ def testAddAttr():
|
||||||
confirm( child.attributes["def"].value=="newval" )
|
confirm( child.attributes["def"].value=="newval" )
|
||||||
|
|
||||||
confirm( len( child.attributes )==2 )
|
confirm( len( child.attributes )==2 )
|
||||||
|
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
child=None
|
|
||||||
|
|
||||||
def testDeleteAttr():
|
def testDeleteAttr():
|
||||||
dom=Document()
|
dom=Document()
|
||||||
|
@ -135,7 +117,6 @@ def testDeleteAttr():
|
||||||
del child.attributes["def"]
|
del child.attributes["def"]
|
||||||
confirm( len( child.attributes)==0 )
|
confirm( len( child.attributes)==0 )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
confirm( len( Node.allnodes )==0 )
|
|
||||||
|
|
||||||
def testRemoveAttr():
|
def testRemoveAttr():
|
||||||
dom=Document()
|
dom=Document()
|
||||||
|
@ -160,7 +141,6 @@ def testRemoveAttrNS():
|
||||||
confirm( len( child.attributes )==1 )
|
confirm( len( child.attributes )==1 )
|
||||||
|
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
|
|
||||||
def testRemoveAttributeNode():
|
def testRemoveAttributeNode():
|
||||||
dom=Document()
|
dom=Document()
|
||||||
|
@ -172,8 +152,6 @@ def testRemoveAttributeNode():
|
||||||
confirm( len( child.attributes )==0 )
|
confirm( len( child.attributes )==0 )
|
||||||
|
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
confirm( len( Node.allnodes )==0 )
|
|
||||||
|
|
||||||
def testChangeAttr():
|
def testChangeAttr():
|
||||||
dom=parseString( "<abc/>" )
|
dom=parseString( "<abc/>" )
|
||||||
|
@ -189,8 +167,6 @@ def testChangeAttr():
|
||||||
el.attributes[ "spam2"]= "bam2"
|
el.attributes[ "spam2"]= "bam2"
|
||||||
confirm( len( el.attributes )==2 )
|
confirm( len( el.attributes )==2 )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
dom=None
|
|
||||||
confirm( len( Node.allnodes )==0 )
|
|
||||||
|
|
||||||
def testGetAttrList():
|
def testGetAttrList():
|
||||||
pass
|
pass
|
||||||
|
@ -236,6 +212,7 @@ def _testElementReprAndStrUnicodeNS():
|
||||||
confirm( string1==string2 )
|
confirm( string1==string2 )
|
||||||
confirm( string1.find("slash:abc" )!=-1 )
|
confirm( string1.find("slash:abc" )!=-1 )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
|
confirm( len( Node.allnodes )==0 )
|
||||||
|
|
||||||
def testAttributeRepr():
|
def testAttributeRepr():
|
||||||
dom=Document()
|
dom=Document()
|
||||||
|
@ -243,6 +220,7 @@ def testAttributeRepr():
|
||||||
node=el.setAttribute( "abc", "def" )
|
node=el.setAttribute( "abc", "def" )
|
||||||
confirm( str( node ) == repr( node ) )
|
confirm( str( node ) == repr( node ) )
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
|
confirm( len( Node.allnodes )==0 )
|
||||||
|
|
||||||
def testTextNodeRepr(): pass
|
def testTextNodeRepr(): pass
|
||||||
|
|
||||||
|
@ -252,6 +230,7 @@ def testWriteXML():
|
||||||
domstr = dom.toxml()
|
domstr = dom.toxml()
|
||||||
dom.unlink()
|
dom.unlink()
|
||||||
confirm(str == domstr)
|
confirm(str == domstr)
|
||||||
|
confirm( len( Node.allnodes )==0 )
|
||||||
|
|
||||||
def testProcessingInstruction(): pass
|
def testProcessingInstruction(): pass
|
||||||
|
|
||||||
|
@ -341,6 +320,8 @@ for name in names:
|
||||||
try:
|
try:
|
||||||
func()
|
func()
|
||||||
print "Test Succeeded", name
|
print "Test Succeeded", name
|
||||||
|
confirm(len(Node.allnodes) == 0,
|
||||||
|
"assertion: len(Node.allnodes) == 0")
|
||||||
if len( Node.allnodes ):
|
if len( Node.allnodes ):
|
||||||
print "Garbage left over:"
|
print "Garbage left over:"
|
||||||
if verbose:
|
if verbose:
|
||||||
|
|
Loading…
Reference in New Issue