From 2a6a4b500d670ead9f54c5ccbcb1421626b1aef8 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 18 Sep 2008 13:00:21 +0000
Subject: [PATCH] Improve identification of software under test and testware (II)
---
opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml | 301 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 233 insertions(+), 68 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml b/opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml
index f530b2e..275e9fd 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml
@@ -142,7 +142,8 @@
<script>
ServersInfoDict=eval(STAFResult)
-
+
+ ServerName='unknown'
ServerVersion='unknown'
ServerBuildId='unknown'
ServerJavaVersion='unknown'
@@ -154,10 +155,14 @@
ServerSystemOS='unknown'
ServerSystemName='unknown'
ServerSvnRevision='unknown'
+ ServerPackage='%s/%s' % (ZIPPATH,ZIPNAME)
+ ServerSNMPJarFile='%s/%s' % (SNMP_OPENDMK_LIBDIR,SNMP_OPENDMK_JARFILE)
if ServersInfoDict.has_key('%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)):
ServerInfoDict=ServersInfoDict['%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)]
-
+
+ ServerName=OPENDSNAME
+
ServerInfoKey='server version'
if ServerInfoDict.has_key(ServerInfoKey):
ServerVersion=ServerInfoDict[ServerInfoKey]
@@ -211,6 +216,13 @@
<message>'Server= %s' % ServerInfoDict </message>
+ <!-- Build the DSML Gateway Information Dictionary -->
+ <script>
+ DSMLName='%s' % DSML_WARNAME
+ DSMLPackage='%s' % DSML_WARPATH
+ DSMLContainer='%s %s' % (WC_TYPE,WC_VERSION)
+ </script>
+
<!-- Get the location of where the test logs are -->
<call function="'GetVar'">
{ 'location' : STAF_REMOTE_HOSTNAME,
@@ -403,45 +415,223 @@
<!-- XML Report Pre -->
<script>
+ localstaf =test_env.staf(STAF_LOCAL_HOSTNAME)
+ remotestaf=test_env.staf(STAF_REMOTE_HOSTNAME)
+
+ stax = test_env.stax(STAF_LOCAL_HOSTNAME)
+ event = test_env.event(STAF_LOCAL_HOSTNAME)
+ eventman = test_env.eventmanager(STAF_LOCAL_HOSTNAME)
+ email = test_env.email(STAF_LOCAL_HOSTNAME)
+ http = test_env.http(STAF_LOCAL_HOSTNAME)
+ dsml = test_env.dsml(STAF_LOCAL_HOSTNAME)
+
xmlfh.write('<qa>\n')
xmlfh.write(' <functional-tests>\n')
xmlfh.write(' <identification>\n')
- xmlfh.write(' <version>\n')
- xmlfh.write(' %s\n' % ServerVersion)
- xmlfh.write(' </version>\n')
- xmlfh.write(' <buildid>\n')
- xmlfh.write(' %s\n' % ServerBuildId)
- xmlfh.write(' </buildid>\n')
- xmlfh.write(' <revision>\n')
- xmlfh.write(' %s\n' % ServerSvnRevision)
- xmlfh.write(' </revision>\n')
- xmlfh.write(' <hostname>\n')
- xmlfh.write(' %s\n' % STAF_REMOTE_HOSTNAME)
- xmlfh.write(' </hostname>\n')
- xmlfh.write(' <platform>\n')
- xmlfh.write(' %s\n' % ServerSystemOS)
- xmlfh.write(' </platform>\n')
- xmlfh.write(' <jvm-version>\n')
- xmlfh.write(' %s\n' % ServerJVMVersion)
- xmlfh.write(' </jvm-version>\n')
- xmlfh.write(' <jvm-label>\n')
- xmlfh.write(' %s\n' % ServerJVMString)
- xmlfh.write(' </jvm-label>\n')
- xmlfh.write(' <jvm-vendor>\n')
- xmlfh.write(' %s\n' % ServerJVMVendor)
- xmlfh.write(' </jvm-vendor>\n')
- xmlfh.write(' <jvm-arch>\n')
- xmlfh.write(' %s\n' % ServerJVMArchitecture)
- xmlfh.write(' </jvm-arch>\n')
- xmlfh.write(' <os-label>\n')
- xmlfh.write(' %s\n' % ServerOsString)
- xmlfh.write(' </os-label>\n')
+ xmlfh.write(' <sut product="opends">\n')
+ xmlfh.write(' <name>\n')
+ xmlfh.write(' %s\n' % ServerName)
+ xmlfh.write(' </name>\n')
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % ServerVersion)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <buildid>\n')
+ xmlfh.write(' %s\n' % ServerBuildId)
+ xmlfh.write(' </buildid>\n')
+ xmlfh.write(' <revision>\n')
+ xmlfh.write(' %s\n' % ServerSvnRevision)
+ xmlfh.write(' </revision>\n')
+ xmlfh.write(' <hostname>\n')
+ xmlfh.write(' %s\n' % STAF_REMOTE_HOSTNAME)
+ xmlfh.write(' </hostname>\n')
+ xmlfh.write(' <platform>\n')
+ xmlfh.write(' %s\n' % ServerSystemOS)
+ xmlfh.write(' </platform>\n')
+ xmlfh.write(' <jvm-version>\n')
+ xmlfh.write(' %s\n' % ServerJVMVersion)
+ xmlfh.write(' </jvm-version>\n')
+ xmlfh.write(' <jvm-label>\n')
+ xmlfh.write(' %s\n' % ServerJVMString)
+ xmlfh.write(' </jvm-label>\n')
+ xmlfh.write(' <jvm-vendor>\n')
+ xmlfh.write(' %s\n' % ServerJVMVendor)
+ xmlfh.write(' </jvm-vendor>\n')
+ xmlfh.write(' <jvm-arch>\n')
+ xmlfh.write(' %s\n' % ServerJVMArchitecture)
+ xmlfh.write(' </jvm-arch>\n')
+ xmlfh.write(' <jvm-args>\n')
+ xmlfh.write(' TBD\n')
+ xmlfh.write(' </jvm-args>\n')
+ xmlfh.write(' <jvm-home>\n')
+ xmlfh.write(' TBD\n')
+ xmlfh.write(' </jvm-home>\n')
+ xmlfh.write(' <jvm-bin>\n')
+ xmlfh.write(' TBD\n')
+ xmlfh.write(' </jvm-bin>\n')
+ xmlfh.write(' <os-label>\n')
+ xmlfh.write(' %s\n' % ServerOsString)
+ xmlfh.write(' </os-label>\n')
+ xmlfh.write(' <server-package>\n')
+ xmlfh.write(' %s\n' % ServerPackage)
+ xmlfh.write(' </server-package>\n')
+ xmlfh.write(' <snmp-jarfile>\n')
+ xmlfh.write(' %s\n' % ServerSNMPJarFile)
+ xmlfh.write(' </snmp-jarfile>\n')
+ xmlfh.write(' <md5-sum>\n')
+ xmlfh.write(' TDB\n')
+ xmlfh.write(' </md5-sum>\n')
+ xmlfh.write(' </sut>\n')
+ xmlfh.write(' <sut product="dsml">\n')
+ xmlfh.write(' <name>\n')
+ xmlfh.write(' %s\n' % DSMLName)
+ xmlfh.write(' </name>\n')
+ xmlfh.write(' <dsml-container>\n')
+ xmlfh.write(' %s\n' % DSMLContainer)
+ xmlfh.write(' </dsml-container>\n')
+ xmlfh.write(' <dsml-package>\n')
+ xmlfh.write(' %s\n' % DSMLPackage)
+ xmlfh.write(' </dsml-package>\n')
+ xmlfh.write(' <md5-sum>\n')
+ xmlfh.write(' TDB\n')
+ xmlfh.write(' </md5-sum>\n')
+ xmlfh.write(' </sut>\n')
+ xmlfh.write(' <testware>\n')
+ xmlfh.write(' <staf>\n')
+ xmlfh.write(' <local>\n')
+ xmlfh.write(' <hostname>\n')
+ xmlfh.write(' %s\n' % STAF_LOCAL_HOSTNAME)
+ xmlfh.write(' </hostname>\n')
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % localstaf.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <rootdir>\n')
+ xmlfh.write(' %s\n' % localstaf.root)
+ xmlfh.write(' </rootdir>\n')
+ xmlfh.write(' </local>\n')
+ xmlfh.write(' <remote>\n')
+ xmlfh.write(' <hostname>\n')
+ xmlfh.write(' %s\n' % STAF_REMOTE_HOSTNAME)
+ xmlfh.write(' </hostname>\n')
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % remotestaf.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <rootdir>\n')
+ xmlfh.write(' %s\n' % remotestaf.root)
+ xmlfh.write(' </rootdir>\n')
+ xmlfh.write(' </remote>\n')
+ xmlfh.write(' </staf>\n')
+ xmlfh.write(' <service name="%s">\n' % stax.name)
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % stax.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <library>\n')
+ xmlfh.write(' %s\n' % stax.library)
+ xmlfh.write(' </library>\n')
+ xmlfh.write(' <executable>\n')
+ xmlfh.write(' %s\n' % stax.executable)
+ xmlfh.write(' </executable>\n')
+ xmlfh.write(' <options>\n')
+ xmlfh.write(' %s\n' % stax.options)
+ xmlfh.write(' </options>\n')
+ xmlfh.write(' <params>\n')
+ xmlfh.write(' %s\n' % stax.params)
+ xmlfh.write(' </params>\n')
+ xmlfh.write(' </service>\n')
+ xmlfh.write(' <service name="%s">\n' % event.name)
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % event.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <library>\n')
+ xmlfh.write(' %s\n' % event.library)
+ xmlfh.write(' </library>\n')
+ xmlfh.write(' <executable>\n')
+ xmlfh.write(' %s\n' % event.executable)
+ xmlfh.write(' </executable>\n')
+ xmlfh.write(' <options>\n')
+ xmlfh.write(' %s\n' % event.options)
+ xmlfh.write(' </options>\n')
+ xmlfh.write(' <params>\n')
+ xmlfh.write(' %s\n' % event.params)
+ xmlfh.write(' </params>\n')
+ xmlfh.write(' </service>\n')
+ xmlfh.write(' <service name="%s">\n' % eventman.name)
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % eventman.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <library>\n')
+ xmlfh.write(' %s\n' % eventman.library)
+ xmlfh.write(' </library>\n')
+ xmlfh.write(' <executable>\n')
+ xmlfh.write(' %s\n' % eventman.executable)
+ xmlfh.write(' </executable>\n')
+ xmlfh.write(' <options>\n')
+ xmlfh.write(' %s\n' % eventman.options)
+ xmlfh.write(' </options>\n')
+ xmlfh.write(' <params>\n')
+ xmlfh.write(' %s\n' % eventman.params)
+ xmlfh.write(' </params>\n')
+ xmlfh.write(' </service>\n')
+ xmlfh.write(' <service name="%s">\n' % email.name)
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % email.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <library>\n')
+ xmlfh.write(' %s\n' % email.library)
+ xmlfh.write(' </library>\n')
+ xmlfh.write(' <executable>\n')
+ xmlfh.write(' %s\n' % email.executable)
+ xmlfh.write(' </executable>\n')
+ xmlfh.write(' <options>\n')
+ xmlfh.write(' %s\n' % email.options)
+ xmlfh.write(' </options>\n')
+ xmlfh.write(' <params>\n')
+ xmlfh.write(' %s\n' % email.params)
+ xmlfh.write(' </params>\n')
+ xmlfh.write(' </service>\n')
+ xmlfh.write(' <service name="%s">\n' % http.name)
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % http.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <library>\n')
+ xmlfh.write(' %s\n' % http.library)
+ xmlfh.write(' </library>\n')
+ xmlfh.write(' <executable>\n')
+ xmlfh.write(' %s\n' % http.executable)
+ xmlfh.write(' </executable>\n')
+ xmlfh.write(' <options>\n')
+ xmlfh.write(' %s\n' % http.options)
+ xmlfh.write(' </options>\n')
+ xmlfh.write(' <params>\n')
+ xmlfh.write(' %s\n' % http.params)
+ xmlfh.write(' </params>\n')
+ xmlfh.write(' </service>\n')
+ xmlfh.write(' <service name="%s">\n' % dsml.name)
+ xmlfh.write(' <version>\n')
+ xmlfh.write(' %s\n' % dsml.version)
+ xmlfh.write(' </version>\n')
+ xmlfh.write(' <library>\n')
+ xmlfh.write(' %s\n' % dsml.library)
+ xmlfh.write(' </library>\n')
+ xmlfh.write(' <executable>\n')
+ xmlfh.write(' %s\n' % dsml.executable)
+ xmlfh.write(' </executable>\n')
+ xmlfh.write(' <options>\n')
+ xmlfh.write(' %s\n' % dsml.options)
+ xmlfh.write(' </options>\n')
+ xmlfh.write(' <params>\n')
+ xmlfh.write(' %s\n' % dsml.params)
+ xmlfh.write(' </params>\n')
+ xmlfh.write(' </service>\n')
+ xmlfh.write(' </testware>\n')
xmlfh.write(' <tests-dir>\n')
xmlfh.write(' %s\n' % logsDir)
xmlfh.write(' </tests-dir>\n')
xmlfh.write(' <tests-url>\n')
xmlfh.write(' %s\n' % logsURI)
xmlfh.write(' </tests-url>\n')
+ xmlfh.write(' <mailto>\n')
+ xmlfh.write(' %s\n' % SEND_MAIL_TO)
+ xmlfh.write(' </mailto>\n')
xmlfh.write(' </identification>\n')
xmlfh.write(' <results>\n')
</script>
@@ -585,26 +775,25 @@
_message='Unable to generate suites test report %s !!!' % groupDir
</script>
<message>_message</message>
-
- <!-- Generate the drill down test report -->
- <script>
- _message='Generated the drill down test report.'
- myreportxsl='%s/xsl/my-report.xsl' % TESTS_SHARED_DIR
- myreporthtml='%s/my-report.html' % logsReportDir
- mytestslog='%s/tests-log.xml' % logsTestsDir
- drillDownReport=report_generation()
+ <!-- Generate the product identification report -->
+ <script>
+ _message='Generated product identification test report.'
+ xslfile= '%s/xsl/id.xsl' % TESTS_SHARED_DIR
+ htmlfile= '%s/id.html' % logsReportDir
+
+ idReport=report_generation()
stringParamsDict={}
try:
- drillDownReport.transformReport(myreportxsl,mytestslog,myreporthtml,stringParamsDict)
+ idReport.transformReport(xslfile,xmlfile,htmlfile,stringParamsDict)
except IOError,details:
- _message='Unable to generate drill down test report %s.' % details
+ _message='Unable to generate product identification test report %s.' % details
except:
- _message='Unable to generate drill down test report !!!'
+ _message='Unable to generate product identification test report !!!'
</script>
- <message>_message</message>
+ <message>_message</message>
<!-- Generate the summary text file -->
<script>
@@ -623,30 +812,6 @@
_message='Unable to generate summary text file %s.' % details
</script>
<message>_message</message>
-
- <!-- FixMe: Compatability with Hudson -->
- <if expr="os.path.exists(myreporthtml)">
- <sequence>
- <message>'Copy %s to %s' % (myreporthtml,TMPDIR)</message>
- <call function="'copyFile'">
- { 'srcfile' : myreporthtml,
- 'destfile' : '%s/my-report.html' % TMPDIR
- }
- </call>
- </sequence>
- </if>
-
- <!-- FixMe: Compatability with Hudson -->
- <if expr="os.path.exists(mytestslog)">
- <sequence>
- <message>'Copy %s to %s' % (mytestslog,TMPDIR)</message>
- <call function="'copyFile'">
- { 'srcfile' : mytestslog,
- 'destfile' : '%s/tests-log.xml' % TMPDIR
- }
- </call>
- </sequence>
- </if>
<if expr="SEND_MAIL_AFTER_TEST_RUN == 'TRUE'">
<sequence>
--
Gitblit v1.10.0