From fc6e98c8d25d75e6225e0b4596d6a13d7a08407c Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Tue, 05 Feb 2008 09:01:26 +0000
Subject: [PATCH] allow runCommand to manage return code (call of checktestRC()) and remove the call of checktestRC in functions that use runCommand ; change setOSvariables to getOSvariables call in environment.xml
---
opends/tests/shared/functions/topology.xml | 56 ++++++++++++++++----------------------------------------
1 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/opends/tests/shared/functions/topology.xml b/opends/tests/shared/functions/topology.xml
index 616b7fe..7e6692e 100755
--- a/opends/tests/shared/functions/topology.xml
+++ b/opends/tests/shared/functions/topology.xml
@@ -894,10 +894,11 @@
</function-arg-description>
<function-arg-property name="type" value="boolean" />
</function-arg-def>
-
+
<function-arg-def name="expectedRC" type="optional" default="0">
<function-arg-description>
- Expected return code value. Default value is 0
+ Expected return code value. Default value is 0.
+ Wildcard 'noCheck' to not check the RC
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
@@ -975,21 +976,12 @@
{ 'name' : 'Enable Replication',
'location' : location,
'command' : STAFCmd,
- 'arguments' : STAFCmdParams
- }
- </call>
- <script>
- STAXCode=RC
- STAXReason=STAXResult
- </script>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
+ 'arguments' : STAFCmdParams,
+ 'expectedRC': expectedRC
}
</call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -1083,7 +1075,8 @@
<function-arg-def name="expectedRC" type="optional" default="0">
<function-arg-description>
- Expected return code value. Default value is 0
+ Expected return code value. Default value is 0.
+ Wildcard 'noCheck' to not check the RC
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
@@ -1135,21 +1128,12 @@
{ 'name' : 'Initialize Replication',
'location' : location,
'command' : STAFCmd,
- 'arguments' : STAFCmdParams
- }
- </call>
- <script>
- STAXCode=RC
- STAXReason=STAXResult
- </script>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
+ 'arguments' : STAFCmdParams,
+ 'expectedRC': expectedRC
}
</call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -1224,7 +1208,8 @@
<function-arg-def name="expectedRC" type="optional" default="0">
<function-arg-description>
- Expected return code value. Default value is 0
+ Expected return code value. Default value is 0.
+ Wildcard 'noCheck' to not check the RC
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
@@ -1266,21 +1251,12 @@
{ 'name' : 'Disable Replication',
'location' : location,
'command' : STAFCmd,
- 'arguments' : STAFCmdParams
- }
- </call>
- <script>
- STAXCode=RC
- STAXReason=STAXResult
- </script>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
+ 'arguments' : STAFCmdParams,
+ 'expectedRC': expectedRC
}
</call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
--
Gitblit v1.10.0