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/dsconfig.xml | 231 ++++++++++++++++++++-------------------------------------
1 files changed, 81 insertions(+), 150 deletions(-)
diff --git a/opends/tests/shared/functions/dsconfig.xml b/opends/tests/shared/functions/dsconfig.xml
index 8ac7562..0fd315e 100755
--- a/opends/tests/shared/functions/dsconfig.xml
+++ b/opends/tests/shared/functions/dsconfig.xml
@@ -143,7 +143,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>
@@ -182,22 +183,13 @@
{ 'name' : 'Modify dsconfig object',
'location' : location,
'command' : STAFCmd,
- 'arguments' : STAFCmdParams
+ 'arguments' : STAFCmdParams,
+ 'expectedRC': expectedRC
}
</call>
- <script>
- STAXCode=RC
- STAXReason=STAXResult
- </script>
- <if expr="expectedRC != 'noCheck'">
- <call function="'checktestRC'">
- { 'returncode' : STAXCode ,
- 'result' : STAXReason ,
- 'expected' : expectedRC }
- </call>
- </if>
+
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -301,7 +293,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>
@@ -338,27 +331,20 @@
{ 'name' : 'Get dsconfig object',
'location' : location,
'command' : STAFCmd,
- 'arguments' : STAFCmdParams
+ 'arguments' : STAFCmdParams,
+ 'expectedRC': expectedRC
}
</call>
<script>
STAXCode=RC
STAXReason=STAXResult[0][1]
</script>
- <if expr="expectedAttributeValue == 'none'">
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
+ <if expr="expectedAttributeValue != 'none'">
+ <call function="'checktestString'">
+ { 'expectedString' : expectedAttributeValue,
+ 'returnString' : STAXReason
}
</call>
- <else>
- <call function="'checktestString'">
- { 'expectedString' : expectedAttributeValue,
- 'returnString' : STAXReason
- }
- </call>
- </else>
</if>
<return>
STAXReason
@@ -451,7 +437,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>
@@ -482,21 +469,12 @@
{ 'name' : 'execute dsconfig subcommand',
'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>
@@ -607,14 +585,8 @@
'expectedRC' : expectedRC
}
</call>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
- }
- </call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -726,14 +698,8 @@
'expectedRC' : expectedRC
}
</call>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
- }
- </call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -809,7 +775,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>
@@ -840,20 +807,12 @@
{ 'name' : 'Modify dsconfig object',
'location' : location,
'command' : STAFCmd,
- 'arguments' : STAFCmdParams
+ 'arguments' : STAFCmdParams,
+ 'expectedRC': expectedRC
}
</call>
- <script>
- STAXCode=RC
- STAXReason=STAXResult
- </script>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode ,
- 'result' : STAXReason ,
- 'expected' : expectedRC }
- </call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -965,14 +924,8 @@
'expectedRC' : expectedRC
}
</call>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
- }
- </call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -1048,7 +1001,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>
@@ -1077,24 +1031,15 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
<call function="'runCommand'">
- { 'name' : 'Modify dsconfig object',
+ { 'name' : 'Modify dsconfig object',
'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>
@@ -1206,14 +1151,8 @@
'expectedRC' : expectedRC
}
</call>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
- }
- </call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -1309,6 +1248,13 @@
<function-arg-property-data type="choice" value="'substring'" />
</function-arg-property>
</function-arg-def>
+
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0.
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ </function-arg-def>
</function-map-args>
<sequence>
<!-- Local variables -->
@@ -1325,7 +1271,8 @@
{ 'name' : 'dsconfig addIndex',
'location' : location,
'command' : dsconfigCmd,
- 'arguments' : dsconfigParams
+ 'arguments' : dsconfigParams,
+ 'expectedRC': expectedRC
}
</call>
<return>
@@ -1437,6 +1384,13 @@
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
+
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0.
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ </function-arg-def>
</function-map-args>
<sequence>
<!-- Local variables -->
@@ -1455,7 +1409,8 @@
{ 'name' : 'dsconfig modifyIndex',
'location' : location,
'command' : dsconfigCmd,
- 'arguments' : dsconfigParams
+ 'arguments' : dsconfigParams,
+ 'expectedRC': expectedRC
}
</call>
<return>
@@ -1538,6 +1493,13 @@
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
+
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0.
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ </function-arg-def>
</function-map-args>
<sequence>
<!-- Local variables -->
@@ -1553,7 +1515,8 @@
{ 'name' : 'dsconfig removeIndex',
'location' : location,
'command' : dsconfigCmd,
- 'arguments' : dsconfigParams
+ 'arguments' : dsconfigParams,
+ 'expectedRC': expectedRC
}
</call>
<return>
@@ -1637,7 +1600,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>
@@ -1667,21 +1631,12 @@
{ 'name' : 'Modify dsconfig object',
'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>
@@ -1742,7 +1697,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>
@@ -1770,21 +1726,12 @@
{ 'name' : 'List synchronization providers',
'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>
@@ -1876,7 +1823,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>
@@ -1910,21 +1858,12 @@
{ 'name' : 'Modify dsconfig object',
'location' : location,
'command' : STAFCmd,
- 'arguments' : STAFCmdParams
+ 'arguments' : STAFCmdParams,
+ 'expectedRC': expectedRC
}
</call>
- <script>
- STAXCode=RC
- STAXReason=STAXResult
- </script>
- <call function="'checktestRC'">
- { 'returncode' : STAXCode,
- 'result' : STAXReason,
- 'expected' : expectedRC
- }
- </call>
<return>
- STAXReason
+ STAXResult
</return>
</sequence>
</function>
@@ -2023,7 +1962,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>
@@ -2057,21 +1997,12 @@
{ 'name' : 'Modify dsconfig object',
'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