From 96d4a1c7cef8d3ced7735a74ebef95e93fa18321 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 14 Sep 2009 17:04:13 +0000
Subject: [PATCH] Fix snmp/snmp_mibvalues testsuite and fix tests report generation
---
opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl | 2 +-
opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl | 2 +-
opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties | 3 ++-
opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py | 4 ++--
opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-alltests-report.xsl | 2 +-
opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl | 2 +-
opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml | 4 ++--
opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl | 2 +-
8 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
index 12dfcb7..3186dd3 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
@@ -74,7 +74,7 @@
# OpenDS section
default.opends.dir=${project.home}/build/package
-default.opends.name=${product.name}
+default.opends.name=${product.short.name}
opends.dir=${default.opends.dir}
opends.name=${default.opends.name}
@@ -89,6 +89,7 @@
# Tests section
tests.default=true
+tests.tmp.dir=${logs.dir}/${tests.type}/run
tests.dir=${basedir}/${tests.type}
tests.shared.dir=${shared.dir}/tests
tests.config.stubs=${tests.shared.dir}/config.py.stubs
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
index bb8c320..345bc28 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
@@ -54,7 +54,7 @@
<!-- Default value for product.name variable -->
<property file="${project.home}/PRODUCT"/>
- <property name="product.name"
+ <property name="product.short.name"
value="${SHORT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}"/>
<!-- Define antfile.dir variable -->
@@ -227,8 +227,8 @@
<var name="archives.dir" value="${repository.dir}/archives"/>
<var name="tests.run.dir" value="${logs.dir}/${tests.type}/run"/>
- <var name="tests.tmp.dir" value="${logs.dir}/${tests.type}/tmp"/>
+<echo>${tests.tmp.dir}</echo>
<if>
<equals arg1="${os.family}" arg2="windows"/>
<then>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py b/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py
index 312135a..60bfc6f 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py
@@ -41,9 +41,9 @@
for line in output.splitlines():
if line.startswith('ds'):
- key = line.split(separator)[0].strip()
+ key = line.split(separator,1)[0].strip()
try:
- value = line.split(separator)[1].strip()
+ value = line.split(separator,1)[1].strip()
except IndexError:
value = '-'
table[key] = value
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-alltests-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-alltests-report.xsl
index 10ebc74..cce8011 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-alltests-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-alltests-report.xsl
@@ -54,9 +54,9 @@
<!--- Test Report Header Variables -->
<xsl:variable name="id" select="identification"/>
<xsl:variable name="sut" select="$id/sut"/>
- <xsl:variable name="productname" select="normalize-space($id/productname)"/>
<xsl:variable name="url" select="normalize-space($id/tests-url)"/>
<xsl:variable name="tests-dir" select="normalize-space($id/tests-dir)"/>
+ <xsl:variable name="productname" select="normalize-space($sut/name)"/>
<xsl:variable name="version" select="$sut/version"/>
<xsl:variable name="buildid" select="$sut/buildid"/>
<xsl:variable name="revision" select="$sut/revision"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
index 422df20..904383a 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
@@ -57,10 +57,10 @@
<xsl:variable name="id" select="identification"/>
<xsl:variable name="sut" select="$id/sut"/>
<xsl:variable name="testware" select="$id/testware"/>
- <xsl:variable name="productname" select="normalize-space($id/productname)"/>
<xsl:variable name="mailto" select="normalize-space($id/mailto)"/>
<xsl:variable name="tests-dir" select="normalize-space($id/tests-dir)"/>
<xsl:variable name="url" select="normalize-space($id/tests-url)"/>
+ <xsl:variable name="productname" select="normalize-space($sut/name)"/>
<xsl:variable name="hostname" select="normalize-space($sut/hostname)"/>
<xsl:variable name="version" select="normalize-space($sut/version)"/>
<xsl:variable name="buildid" select="normalize-space($sut/buildid)"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
index eab74a2..e5bc6ce 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
@@ -60,10 +60,10 @@
<!--- Test Suites Report Header Variables -->
<xsl:variable name="id" select="identification"/>
<xsl:variable name="sut" select="$id/sut"/>
- <xsl:variable name="productname" select="normalize-space($id/productname)"/>
<xsl:variable name="mailto" select="normalize-space($id/mailto)"/>
<xsl:variable name="tests-dir" select="normalize-space($id/tests-dir)"/>
<xsl:variable name="url" select="normalize-space($id/tests-url)"/>
+ <xsl:variable name="productname" select="normalize-space($sut/name)"/>
<xsl:variable name="hostname" select="normalize-space($sut/hostname)"/>
<xsl:variable name="version" select="normalize-space($sut/version)"/>
<xsl:variable name="buildid" select="normalize-space($sut/buildid)"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
index 49febdc..4efaf27 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
@@ -61,10 +61,10 @@
<!--- Test Report Header Variables -->
<xsl:variable name="id" select="identification"/>
<xsl:variable name="sut" select="$id/sut"/>
- <xsl:variable name="productname" select="normalize-space($id/productname)"/>
<xsl:variable name="mailto" select="normalize-space($id/mailto)"/>
<xsl:variable name="tests-dir" select="normalize-space($id/tests-dir)"/>
<xsl:variable name="url" select="normalize-space($id/tests-url)"/>
+ <xsl:variable name="productname" select="normalize-space($sut/name)"/>
<xsl:variable name="hostname" select="normalize-space($sut/hostname)"/>
<xsl:variable name="version" select="normalize-space($sut/version)"/>
<xsl:variable name="buildid" select="normalize-space($sut/buildid)"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl
index 2ea4119..acbf8ed 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl
@@ -60,7 +60,7 @@
<xsl:variable name="url" select="normalize-space($id/tests-url)"/>
<xsl:variable name="tests-dir" select="normalize-space($id/tests-dir)"/>
<xsl:variable name="mailto" select="normalize-space($id/mailto)"/>
- <xsl:variable name="productname" select="normalize-space($id/productname)"/>
+ <xsl:variable name="productname" select="normalize-space($sut[@product='opends']/name)"/>
<xsl:variable name="version" select="normalize-space($sut[@product='opends']/version)"/>
<xsl:element name="html">
--
Gitblit v1.10.0