From d7ee2a2ac11b1600ada645753f2ef3e8dc5f8fad Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 31 Jan 2008 16:46:47 +0000
Subject: [PATCH] ensure files closed in index, dsconfig tests and report generation
---
opendj-sdk/opends/tests/shared/python/common.py | 52 +++++++++++++++++++++++++++++++++++-----------------
opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml | 3 ++-
opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml | 1 +
opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml | 2 ++
4 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
index b407124..3fceb76 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
@@ -60,6 +60,7 @@
else:
lineSingle = line.split(':')
componentList.append(lineSingle)
+ f.close()
componentNumber=0
testNumber=0
@@ -144,6 +145,7 @@
else:
lineSingle = line.split(':')
componentList2.append(lineSingle)
+ f.close()
componentNumber=0
testNumber=0
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
index e7159d4..9c0f79d 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
@@ -60,7 +60,8 @@
else:
lineSingle = line.split(':')
componentList.append(lineSingle)
-
+ f.close()
+
componentNumber=0
testNumber=0
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
index 6281e07..400aa76 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
@@ -621,6 +621,7 @@
testLine = line.split(' ')
indexTests.append(indexTest(testLine[0], testLine[1], testLine[2],
testLine[3], testLine[4]))
+ f.close()
indexTestNumber=0
previousTestName=''
diff --git a/opendj-sdk/opends/tests/shared/python/common.py b/opendj-sdk/opends/tests/shared/python/common.py
index cd8f4d9..7ab853b 100644
--- a/opendj-sdk/opends/tests/shared/python/common.py
+++ b/opendj-sdk/opends/tests/shared/python/common.py
@@ -112,15 +112,24 @@
from javax.xml.transform.stream import StreamSource
from javax.xml.transform.stream import StreamResult
- self.xslSource = StreamSource(FileInputStream("%s" % stylesheet))
- self.tfactory = TransformerFactory.newInstance()
- self.xslTemplate = self.tfactory.newTemplates(self.xslSource)
- self.transformer = self.xslTemplate.newTransformer()
+ self.xsl = FileInputStream("%s" % stylesheet)
+ self.xml = FileInputStream("%s" % xml)
+ self.html = FileOutputStream("%s" % output)
- self.source = StreamSource(FileInputStream("%s" % xml))
- self.result = StreamResult(FileOutputStream("%s" % output))
+ try:
+ self.xslSource = StreamSource(self.xsl)
+ self.tfactory = TransformerFactory.newInstance()
+ self.xslTemplate = self.tfactory.newTemplates(self.xslSource)
+ self.transformer = self.xslTemplate.newTransformer()
- self.transformer.transform(self.source, self.result)
+ self.source = StreamSource(self.xml)
+ self.result = StreamResult(self.html)
+
+ self.transformer.transform(self.source, self.result)
+ finally:
+ self.xsl.close()
+ self.xml.close()
+ self.html.close()
def transformSuitesReport(self,stylesheet,xml,output,params):
from java.io import FileInputStream
@@ -131,17 +140,26 @@
from javax.xml.transform.stream import StreamSource
from javax.xml.transform.stream import StreamResult
- self.xslSource = StreamSource(FileInputStream("%s" % stylesheet))
- self.tfactory = TransformerFactory.newInstance()
- self.xslTemplate = self.tfactory.newTemplates(self.xslSource)
- self.transformer = self.xslTemplate.newTransformer()
+ self.xsl = FileInputStream("%s" % stylesheet)
+ self.xml = FileInputStream("%s" % xml)
+ self.html = FileOutputStream("%s" % output)
- self.source = StreamSource(FileInputStream("%s" % xml))
- self.result = StreamResult(FileOutputStream("%s" % output))
+ try:
+ self.xslSource = StreamSource(self.xsl)
+ self.tfactory = TransformerFactory.newInstance()
+ self.xslTemplate = self.tfactory.newTemplates(self.xslSource)
+ self.transformer = self.xslTemplate.newTransformer()
- self.myAttr = basic_utils().printKey(params)
- self.myValue = basic_utils().printKeyValue(params)
+ self.source = StreamSource(self.xml)
+ self.result = StreamResult(self.html)
- self.transformer.setParameter(self.myAttr, self.myValue)
- self.transformer.transform(self.source, self.result)
+ self.myAttr = basic_utils().printKey(params)
+ self.myValue = basic_utils().printKeyValue(params)
+
+ self.transformer.setParameter(self.myAttr, self.myValue)
+ self.transformer.transform(self.source, self.result)
+ finally:
+ self.xsl.close()
+ self.xml.close()
+ self.html.close()
--
Gitblit v1.10.0