From 673cf2694fc5463a9f8a3f2df17f207480c288c6 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 29 Sep 2009 15:53:27 +0000
Subject: [PATCH] clean up of XML reporting in staf tests
---
opends/tests/staf-tests/shared/tests/runTests.xml | 195 ++++--------------------------------------------
1 files changed, 18 insertions(+), 177 deletions(-)
diff --git a/opends/tests/staf-tests/shared/tests/runTests.xml b/opends/tests/staf-tests/shared/tests/runTests.xml
index ee9278f..c5d5bb7 100755
--- a/opends/tests/staf-tests/shared/tests/runTests.xml
+++ b/opends/tests/staf-tests/shared/tests/runTests.xml
@@ -39,6 +39,22 @@
<script>
listOfChildren=[]
+ xml=xmldoc_service()
+
+ xml.createBlankDocument()
+
+ builder = xml.createBlankDocument()
+
+ doc = builder.newDocument()
+ root = doc.createElement("qa")
+ doc.appendChild(root)
+ ft = doc.createElement("%s" % TESTS_TYPE)
+ root.appendChild(ft);
+ results = doc.createElement("results")
+ ft.appendChild(results);
+
+ xml.writeXMLfile(doc,"%s/results2.xml" % logs.reports)
+
class groupToRun:
def __init__(self, name):
self.name = name
@@ -46,12 +62,6 @@
def getName(self):
return self.name
- testlog=open('%s/tests-log.xml' % logs.tests,'w')
- testlog.write('<qa>\n')
- testlog.write(' <%s>\n' % TESTS_TYPE)
- testlog.write(' <results>\n')
- testlog.close()
-
groupsToRun = []
for line in TEST_PLAN_CUSTOM.split(","):
groupsToRun.append(groupToRun(line.rstrip()))
@@ -145,182 +155,13 @@
'path' : TMPDIR
}
</call>
- <script>
- from java.io import FileInputStream
- from javax.xml.transform.stream import StreamSource
- from javax.xml.transform.stream import StreamResult
- from javax.xml.parsers import DocumentBuilderFactory
- from org.w3c.dom import *
-
- factory = DocumentBuilderFactory.newInstance()
- builder = factory.newDocumentBuilder()
-
- input = FileInputStream("%s/coverage/coverage.xml" % TMPDIR)
- document = builder.parse(input)
- dom = document.getDocumentElement()
- coverageNodes = dom.getElementsByTagName("all").item(0).getChildNodes()
- for coverageNodeIndex in range(coverageNodes.getLength()):
- thisNode = coverageNodes.item(coverageNodeIndex)
- if thisNode.getNodeName() == 'coverage':
- thisNodeAttributes = thisNode.getAttributes()
- if thisNodeAttributes.getNamedItem("type").getNodeValue() == 'block, %':
- rawCoverage = thisNodeAttributes.getNamedItem("value").getNodeValue()
- coverage = rawCoverage.split('%')[0]
- testlog=open('%s/tests-log.xml' % logs.tests,'a')
- testlog.seek(0,2)
- testlog.write(" <all>\n")
- testlog.write(" <coverage>\n")
- testlog.write(" %s\n" % coverage)
- testlog.write(" </coverage>\n")
- testlog.write(" </all>\n")
- testlog.close()
- </script>
</sequence>
- <else>
- <script>
- testlog=open('%s/tests-log.xml' % logs.tests,'a')
- testlog.seek(0,2)
- testlog.write(" <all>\n")
- testlog.write(" <coverage>\n")
- testlog.write(" N/A\n")
- testlog.write(" </coverage>\n")
- testlog.write(" </all>\n")
- testlog.close()
- </script>
- </else>
</if>
- <!-- here goes the section where we get the product's info -->
- <call function="'GetVar'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'type' : 'shared',
- 'variable' : 'Job%s_ServerInfo' % STAXJobID
- }
- </call>
-
- <if expr="RC != 0">
- <script>
- STAFResult='{}'
- </script>
- </if>
-
- <!-- Build the Servers Information Dictionary -->
- <script>
- ServersInfoDict=eval(STAFResult)
-
- ServerVersion='unknown'
- ServerBuildId='unknown'
- ServerJavaVersion='unknown'
- ServerJavaVendor='unknown'
- ServerJVMVersion='unknown'
- ServerJVMVendor='unknown'
- ServerJVMArchitecture='unknown'
- ServerSystemOS='unknown'
- ServerSystemName='unknown'
- ServerSvnRevision='unknown'
-
- if ServersInfoDict.has_key('%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)):
- ServerInfoDict=ServersInfoDict['%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)]
-
- ServerInfoKey='server version'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerVersion=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='server buildid'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerBuildId=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='java version'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerJavaVersion=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='java vendor'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerJavaVendor=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='jvm version'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerJVMVersion=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='jvm vendor'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerJVMVendor=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='jvm architecture'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerJVMArchitecture=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='system os'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerSystemOS=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='system name'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerSystemName=ServerInfoDict[ServerInfoKey]
-
- ServerInfoKey='svn revision'
- if ServerInfoDict.has_key(ServerInfoKey):
- ServerSvnRevision=ServerInfoDict[ServerInfoKey]
-
- else:
- ServerInfoDict='No key found (%s/%s)' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
-
- # Platform and JVM can be overridden from config file
- try:
- if TEST_OS_STRING:
- ServerOsString=TEST_OS_STRING
- else:
- ServerOsString=ServerSystemOS
- except NameError,details:
- ServerOsString=ServerSystemOS
-
- try:
- if TEST_JVM_STRING:
- ServerJVMString=TEST_JVM_STRING
- else:
- ServerJVMString=ServerJVMVersion
- except NameError,details:
- ServerJVMString=ServerJVMVersion
-
- testlog=open('%s/tests-log.xml' % logs.tests,'a')
- testlog.seek(0,2)
- testlog.write(' </results>\n')
- testlog.write(' <identification>\n')
- testlog.write(' <version>\n')
- testlog.write(' %s\n' % ServerVersion)
- testlog.write(' </version>\n')
- testlog.write(' <buildid>\n')
- testlog.write(' %s\n' % ServerBuildId)
- testlog.write(' </buildid>\n')
- testlog.write(' <revision>\n')
- testlog.write(' %s\n' % ServerSvnRevision)
- testlog.write(' </revision>\n')
- testlog.write(' <platform>\n')
- testlog.write(' %s\n' % ServerSystemOS)
- testlog.write(' </platform>\n')
- testlog.write(' <os-label>\n')
- testlog.write(' %s\n' % ServerOsString)
- testlog.write(' </os-label>\n')
- testlog.write(' <jvm-version>\n')
- testlog.write(' %s\n' % ServerJVMVersion)
- testlog.write(' </jvm-version>\n')
- testlog.write(' <jvm-label>\n')
- testlog.write(' %s\n' % ServerJVMString)
- testlog.write(' </jvm-label>\n')
- testlog.write(' <jvm-vendor>\n')
- testlog.write(' %s\n' % ServerJVMVendor)
- testlog.write(' </jvm-vendor>\n')
- testlog.write(' <tests-dir>\n')
- testlog.write(' %s\n' % logs.directory)
- testlog.write(' </tests-dir>\n')
- testlog.write(' </identification>\n')
- testlog.write(' </%s>\n' % TESTS_TYPE)
- testlog.write('</qa>\n')
- testlog.close()
- </script>
-
<return>listOfChildren</return>
</sequence>
+
</function>
+
</stax>
--
Gitblit v1.10.0