From 597e0001aae0015c33ab94f0d31dc5d4357652cb Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Thu, 30 Aug 2007 20:22:22 +0000
Subject: [PATCH] surround the XSL report generation step with try catch to help diagnose when the XML log is malformed
---
opends/tests/functional-tests/testcases/runTestJob.xml | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/runTestJob.xml b/opends/tests/functional-tests/testcases/runTestJob.xml
index aa8e61a..7f620f0 100644
--- a/opends/tests/functional-tests/testcases/runTestJob.xml
+++ b/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -454,27 +454,32 @@
</message>
<script>
- from java.io import FileInputStream
- from java.io import FileOutputStream
- from java.io import ByteArrayOutputStream
-
- from javax.xml.transform import TransformerFactory
- from javax.xml.transform.stream import StreamSource
- from javax.xml.transform.stream import StreamResult
-
- xslSource = StreamSource(FileInputStream("%s" % xslfile))
- xslTemplate = TransformerFactory.newInstance().newTemplates(xslSource)
- transformer = xslTemplate.newTransformer()
-
- source = StreamSource(FileInputStream("%s" % xmlfile))
- result = StreamResult(FileOutputStream("%s" % htmlfile))
- # the original report
- transformer.transform(source, result)
-
- #the new report transformation
- TransformerFactory.newInstance().newTemplates(StreamSource(FileInputStream("%s/xsl/my-report.xsl" % TESTS_SHARED_DIR))).newTransformer().transform(StreamSource(FileInputStream("%s/tests-log.xml" % TMPDIR)), StreamResult(FileOutputStream("%s/my-report.html" % TMPDIR)))
+ _message=''
+ try:
+ from java.io import FileInputStream
+ from java.io import FileOutputStream
+ from java.io import ByteArrayOutputStream
+
+ from javax.xml.transform import TransformerFactory
+ from javax.xml.transform.stream import StreamSource
+ from javax.xml.transform.stream import StreamResult
+
+ xslSource = StreamSource(FileInputStream("%s" % xslfile))
+ xslTemplate = TransformerFactory.newInstance().newTemplates(xslSource)
+ transformer = xslTemplate.newTransformer()
+
+ source = StreamSource(FileInputStream("%s" % xmlfile))
+ result = StreamResult(FileOutputStream("%s" % htmlfile))
+ # the original report
+ transformer.transform(source, result)
+
+ #the new report transformation
+ TransformerFactory.newInstance().newTemplates(StreamSource(FileInputStream("%s/xsl/my-report.xsl" % TESTS_SHARED_DIR))).newTransformer().transform(StreamSource(FileInputStream("%s/tests-log.xml" % TMPDIR)), StreamResult(FileOutputStream("%s/my-report.html" % TMPDIR)))
+ _message='Generated drill-down HTML report'
+ except:
+ _message='Could not generate drill-down HTML report'
</script>
-
+ <message>_message</message>
<if expr="SEND_MAIL_AFTER_TEST_RUN == 'TRUE'">
<sequence>
<message>
--
Gitblit v1.10.0