From 3b10b7f44b8fcc8338c5638e6a8a77eb4f17b121 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 22 May 2007 08:24:10 +0000
Subject: [PATCH] Implement Issue 1498 Test report should show build number and date

---
 opends/tests/functional-tests/testcases/runTestJob.xml |  101 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/runTestJob.xml b/opends/tests/functional-tests/testcases/runTestJob.xml
index 940a49b..3899b66 100644
--- a/opends/tests/functional-tests/testcases/runTestJob.xml
+++ b/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -59,6 +59,84 @@
       </else>
       </if>
 
+      <!--- Import required shared xml libraries -->
+      <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+        file="'%s/stafcmd.xml' % (TESTS_FUNCTIONS_DIR)" />
+        
+      <!-- Get Directory Server Variables -->
+      <call function="'GetVar'">
+        { 'location'  : STAF_REMOTE_HOSTNAME,
+          'type'      : 'shared',
+          'variable'  : 'ServerInfo' }
+      </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'
+        ServerSystemOS='unknown'
+        ServerSystemName='unknown'
+        ServerSvnRevision='unknown'
+                  
+        if ServersInfoDict.has_key('%s/%s' % (TMPDIR,OPENDSNAME)):       
+          ServerInfoDict=ServersInfoDict['%s/%s' % (TMPDIR,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='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)' % (TMPDIR,OPENDSNAME)
+                    
+      </script>
+      
+      <message>'Server= %s' % ServerInfoDict </message>     
+                        
       <stafcmd name="'STAF Command: Log Query All'">
         <location>'%s' % STAF_LOCAL_HOSTNAME </location>
         <service>'log'</service>
@@ -219,15 +297,24 @@
         xmlfh.write('&lt;qa&gt;\n')
         xmlfh.write('  &lt;functional-tests&gt;\n')
         xmlfh.write('    &lt;identification&gt;\n')
+        xmlfh.write('      &lt;version&gt;\n')
+        xmlfh.write('        %s\n' % ServerVersion)
+        xmlfh.write('      &lt;/version&gt;\n')    
+        xmlfh.write('      &lt;buildid&gt;\n')
+        xmlfh.write('        %s\n' % ServerBuildId)
+        xmlfh.write('      &lt;/buildid&gt;\n')
+        xmlfh.write('      &lt;revision&gt;\n')
+        xmlfh.write('        %s\n' % ServerSvnRevision)
+        xmlfh.write('      &lt;/revision&gt;\n')                 
         xmlfh.write('      &lt;platform&gt;\n')
-        xmlfh.write('        %s\n' % TEST_OS_STRING)
+        xmlfh.write('        %s\n' % ServerSystemOS)
         xmlfh.write('      &lt;/platform&gt;\n')
-        xmlfh.write('      &lt;hardware&gt;\n')
-        xmlfh.write('        %s\n' % TEST_HW_STRING)
-        xmlfh.write('      &lt;/hardware&gt;\n')
-        xmlfh.write('      &lt;jvm&gt;\n')
-        xmlfh.write('        %s\n' % TEST_JVM_STRING)
-        xmlfh.write('      &lt;/jvm&gt;\n')
+        xmlfh.write('      &lt;jvm-version&gt;\n')
+        xmlfh.write('        %s\n' % ServerJVMVersion)
+        xmlfh.write('      &lt;/jvm-version&gt;\n')
+        xmlfh.write('      &lt;jvm-vendor&gt;\n')
+        xmlfh.write('        %s\n' % ServerJVMVendor)
+        xmlfh.write('      &lt;/jvm-vendor&gt;\n')        
         xmlfh.write('    &lt;/identification&gt;\n')
         xmlfh.write('    &lt;results&gt;\n')
       </script>

--
Gitblit v1.10.0