From 1c44e2d80dd762b6c4f73e5455a891b27ff2eb10 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Fri, 27 Apr 2007 23:49:07 +0000
Subject: [PATCH] 1. added a parser to show the percentage of tests succesful. 2. added adifferent email depending on if the test could or could not be run 3. Removed the superfluous attachment in the email.
---
opendj-sdk/opends/tests/functional-tests/staf-installer.xml | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
index 8b804fc..6adf8e0 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
@@ -619,14 +619,36 @@
</copy>
<echo>You may access the tests report at</echo>
<echo>${tests.run.dir}/${tests.run.time}/report/results.html</echo>
- <condition property="email.send">
- <equals arg1="${email.enabled}" arg2="y"
- casesensitive="false" trim="true"/>
- </condition>
<antcall target="send-mail"/>
</target>
- <target name="send-mail" if="email.send">
+ <target name="send-mail-prepare">
+ <condition property="test.successful">
+ <available file="${staf.tmp.dir}/results.html"/>
+ </condition>
+ <condition property="email.send">
+ <equals arg1="${email.enabled}" arg2="y"
+ casesensitive="false" trim="true"/>
+ </condition>
+ </target>
+
+ <target name="send-mail-get-percentage" depends="send-mail-prepare" if="test.successful">
+ <echo>test report found.Proceeding...</echo>
+ <delete file="${staf.tmp.dir}/percentage.properties"/>
+ <copy file="${staf.tmp.dir}/results.html" tofile="${staf.tmp.dir}/percentage.properties">
+ <filterchain>
+ <linecontains>
+ <contains value='font size="+2'/>
+ </linecontains>
+ <tokenfilter>
+ <replaceregex pattern=".*font size=.+2..(\d+)%./font.*" replace="test.percentage=\1"/>
+ </tokenfilter>
+ </filterchain>
+ </copy>
+ <property file="${staf.tmp.dir}/percentage.properties"/>
+ </target>
+
+ <target name="send-mail" if="email.send" depends="send-mail-get-percentage">
<condition property="email.send.noauth">
<or>
<not>
@@ -644,7 +666,7 @@
<available file="${staf.tmp.dir}/results.html"/>
</condition>
<condition property="email.subject"
- value="FT - Run - ${daily.date} - ${os.name} - ${os.arch}"
+ value="FT - Run - ${daily.date} - ${os.name} - ${os.arch} - ${test.percentage}%"
else="FT - Failed -${daily.date} - ${os.name} - ${os.arch}">
<available file="${staf.tmp.dir}/results.html"/>
</condition>
@@ -655,22 +677,20 @@
<mail from="${email.from}"
tolist="${email.to}"
subject="${email.subject}"
- files="${staf.tmp.dir}/results.html"
mailhost="${email.server.host}"
mailport="${email.server.port}"
- messagefile="${staf.tmp.dir}/results.html"
+ messagefile="${email.file}"
messagemimetype="text/html" />
</target>
<target name="send-mail-withauth" unless="email.send.noauth">
<mail from="${email.from}"
tolist="${email.to}"
subject="${email.subject}"
- files="${staf.tmp.dir}/results.html"
mailhost="${email.server.host}"
mailport="${email.server.port}"
user="${email.server.user}"
password="${email.server.pwd}"
- messagefile="${staf.tmp.dir}/results.html"
+ messagefile="${email.file}"
messagemimetype="text/html" />
</target>
--
Gitblit v1.10.0