From 23cdb7fde73cc30a3a5407ced5386c3cbb9fe8e5 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Wed, 16 Apr 2008 14:38:25 +0000
Subject: [PATCH] add suffix parameter when calling client
---
opends/tests/system-tests/phases/scheduler/scheduler.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/opends/tests/system-tests/phases/scheduler/scheduler.xml b/opends/tests/system-tests/phases/scheduler/scheduler.xml
index 50cd2d9..f21aa5f 100755
--- a/opends/tests/system-tests/phases/scheduler/scheduler.xml
+++ b/opends/tests/system-tests/phases/scheduler/scheduler.xml
@@ -81,7 +81,8 @@
{
'clients' : clients,
'instances' : instances,
- 'scenario' : scenario
+ 'scenario' : scenario,
+ 'suffix' : suffix
}
</call>
<!--========== Merge files ==========-->
@@ -114,6 +115,8 @@
</function-arg-def>
<function-arg-def name="scenario" type="required">
</function-arg-def>
+ <function-arg-def name="suffix" type="required">
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -249,6 +252,7 @@
'client' : client,
'duration' : clientDuration,
'instances' : instances,
+ 'suffix' : suffix,
'fileFd' : fileFd
}
</call>
@@ -280,6 +284,8 @@
</function-arg-def>
<function-arg-def name="instances" type="required">
</function-arg-def>
+ <function-arg-def name="suffix" type="required">
+ </function-arg-def>
<function-arg-def name="fileFd" type="required">
</function-arg-def>
</function-map-args>
@@ -394,6 +400,7 @@
'client' : client,
'instances' : instances,
'duration' : duration,
+ 'suffix' : suffix,
'fileFd' : fileFd
}
</call>
@@ -413,10 +420,17 @@
xml result structure is coherent...
Another issue: in this case we can not get the client RC
-->
- <message>
- 'ERROR: client %s has been killed, %s is probably over loaded'%\
- (client.getName(),client.getHost())
- </message>
+ <script>
+ errMsg = 'ERROR: client %s has been killed,' % client.getName()
+ errMsg = '%s %s is probably over loaded'% (errMsg,client.getHost())
+ </script>
+ <call function="'writeMessage'">
+ {
+ 'content' : errMsg,
+ 'fileFd' : fileFd
+ }
+ </call>
+ <message> errMsg </message>
<script>
ERR_NUM[0] += 1
</script>
--
Gitblit v1.10.0