summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lxml/tests/common_imports.py8
-rw-r--r--src/lxml/tests/test_classlookup.py1
-rw-r--r--src/lxml/tests/test_elementtree.py4
-rw-r--r--src/lxml/tests/test_htmlparser.py5
-rw-r--r--src/lxml/tests/test_io.py6
-rw-r--r--src/lxml/tests/test_nsclasses.py2
-rw-r--r--src/lxml/tests/test_objectify.py2
-rw-r--r--src/lxml/tests/test_pyclasslookup.py1
-rw-r--r--test.py3
9 files changed, 24 insertions, 8 deletions
diff --git a/src/lxml/tests/common_imports.py b/src/lxml/tests/common_imports.py
index 4cc188d5..2f24cde1 100644
--- a/src/lxml/tests/common_imports.py
+++ b/src/lxml/tests/common_imports.py
@@ -1,7 +1,7 @@
import unittest
import os.path
from StringIO import StringIO
-import re
+import re, gc
from lxml import etree
@@ -40,6 +40,12 @@ except NameError:
return seq
class HelperTestCase(unittest.TestCase):
+ def setUp(self):
+ gc.collect()
+
+ def tearDown(self):
+ gc.collect()
+
def parse(self, text):
f = StringIO(text)
return etree.parse(f)
diff --git a/src/lxml/tests/test_classlookup.py b/src/lxml/tests/test_classlookup.py
index 31f733be..2cf23c99 100644
--- a/src/lxml/tests/test_classlookup.py
+++ b/src/lxml/tests/test_classlookup.py
@@ -26,6 +26,7 @@ class ClassLookupTestCase(HelperTestCase):
def tearDown(self):
etree.setElementClassLookup()
+ super(ClassLookupTestCase, self).tearDown()
def test_namespace_lookup(self):
class TestElement(etree.ElementBase):
diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
index 4959b077..c9f8a81d 100644
--- a/src/lxml/tests/test_elementtree.py
+++ b/src/lxml/tests/test_elementtree.py
@@ -9,7 +9,7 @@ for IO related test cases.
"""
import unittest, doctest
-import os, re, shutil, tempfile, copy, operator
+import os, re, shutil, tempfile, copy, operator, gc
from common_imports import StringIO, etree, ElementTree, cElementTree
from common_imports import fileInTestDir, canonicalize
@@ -24,8 +24,10 @@ class ETreeTestCaseBase(unittest.TestCase):
def setUp(self):
self._temp_dir = tempfile.mkdtemp()
+ gc.collect()
def tearDown(self):
+ gc.collect()
shutil.rmtree(self._temp_dir)
def getTestFilePath(self, name):
diff --git a/src/lxml/tests/test_htmlparser.py b/src/lxml/tests/test_htmlparser.py
index 92757c24..30310acd 100644
--- a/src/lxml/tests/test_htmlparser.py
+++ b/src/lxml/tests/test_htmlparser.py
@@ -10,7 +10,7 @@ import tempfile, os
from common_imports import StringIO, etree, fileInTestDir
from common_imports import SillyFileLike, HelperTestCase
-class HtmlParserTestCaseBase(HelperTestCase):
+class HtmlParserTestCase(HelperTestCase):
"""HTML parser test cases
"""
etree = etree
@@ -25,6 +25,7 @@ class HtmlParserTestCaseBase(HelperTestCase):
uhtml_str = u"<html><head><title>test á\uF8D2</title></head><body><h1>page á\uF8D2 title</h1></body></html>"
def tearDown(self):
+ super(HtmlParserTestCase, self).tearDown()
self.etree.setDefaultParser()
def test_module_HTML(self):
@@ -276,7 +277,7 @@ class HtmlParserTestCaseBase(HelperTestCase):
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([unittest.makeSuite(HtmlParserTestCaseBase)])
+ suite.addTests([unittest.makeSuite(HtmlParserTestCase)])
return suite
if __name__ == '__main__':
diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py
index 0bfe6a1d..926d663c 100644
--- a/src/lxml/tests/test_io.py
+++ b/src/lxml/tests/test_io.py
@@ -5,7 +5,7 @@ IO test cases that apply to both etree and ElementTree
"""
import unittest
-import tempfile, gzip, os
+import tempfile, gzip, os, gc
from common_imports import etree, ElementTree, fileInTestDir
from common_imports import SillyFileLike, LargeFileLike
@@ -18,10 +18,14 @@ class IOTestCaseBase(unittest.TestCase):
def setUp(self):
"""Setting up a minimal tree
"""
+ gc.collect()
self.root = self.etree.Element('a')
self.root_str = self.etree.tostring(self.root)
self.tree = self.etree.ElementTree(self.root)
+ def tearDown(self):
+ gc.collect()
+
def test_write_filename(self):
# (c)ElementTree supports filename strings as write argument
diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
index 001f4d43..ae7da9f6 100644
--- a/src/lxml/tests/test_nsclasses.py
+++ b/src/lxml/tests/test_nsclasses.py
@@ -21,6 +21,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
return u'bluff'
def setUp(self):
+ super(ETreeNamespaceClassesTestCase, self).setUp()
lookup = etree.ElementNamespaceClassLookup()
self.Namespace = lookup.get_namespace
parser = etree.XMLParser()
@@ -30,6 +31,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
def tearDown(self):
etree.setDefaultParser()
del self.Namespace
+ super(ETreeNamespaceClassesTestCase, self).tearDown()
def test_registry(self):
ns = self.Namespace(u'ns01')
diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
index dc423b03..0f24027e 100644
--- a/src/lxml/tests/test_objectify.py
+++ b/src/lxml/tests/test_objectify.py
@@ -72,6 +72,7 @@ class ObjectifyTestCase(HelperTestCase):
return self.etree.XML(xml, self.parser)
def setUp(self):
+ super(ObjectifyTestCase, self).setUp()
self.parser = self.etree.XMLParser(remove_blank_text=True)
self.lookup = etree.ElementNamespaceClassLookup(
objectify.ObjectifyElementClassLookup() )
@@ -87,6 +88,7 @@ class ObjectifyTestCase(HelperTestCase):
objectify.setPytypeAttributeTag()
del self.lookup
del self.parser
+ super(ObjectifyTestCase, self).tearDown()
def test_element_nsmap_default(self):
elt = objectify.Element("test")
diff --git a/src/lxml/tests/test_pyclasslookup.py b/src/lxml/tests/test_pyclasslookup.py
index 66f6550f..ecea0972 100644
--- a/src/lxml/tests/test_pyclasslookup.py
+++ b/src/lxml/tests/test_pyclasslookup.py
@@ -33,6 +33,7 @@ class PyClassLookupTestCase(HelperTestCase):
def tearDown(self):
self.parser.setElementClassLookup(None)
+ super(PyClassLookupTestCase, self).tearDown()
def _setClassLookup(self, lookup_function):
class Lookup(PythonElementClassLookup):
diff --git a/test.py b/test.py
index a1e01baa..6c90bcdb 100644
--- a/test.py
+++ b/test.py
@@ -63,8 +63,6 @@ Options:
# and cleaner though, at the expense of more limited functionality.
#
-import gc
-
import re
import os
import sys
@@ -418,7 +416,6 @@ class CustomTestRunner(unittest.TextTestRunner):
test(result)
stopTime = time.time()
timeTaken = float(stopTime - startTime)
- gc.collect()
result.printErrors()
run = result.testsRun
if not self.cfg.quiet:
View Lorry Controller Status