From 7d59da27ea7ef3fde60601c3a27ffcc7b4be2ff0 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 25 Jun 2013 13:09:47 +0000
Subject: [PATCH] CR-1908 Added basic stress on replicated topology and added add/del operation => fixed cleanup for operations testsuite => removed traces for sdk tools
---
opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml | 3
opends/tests/staf-tests/shared/functions/sdk.xml | 150 ++++++++++++++++++++++++++-----------------------
2 files changed, 81 insertions(+), 72 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/sdk.xml b/opends/tests/staf-tests/shared/functions/sdk.xml
index 9440bad..133bd5a 100644
--- a/opends/tests/staf-tests/shared/functions/sdk.xml
+++ b/opends/tests/staf-tests/shared/functions/sdk.xml
@@ -304,23 +304,25 @@
}
</call>
<else>
- <call function="'runCommand'">
- { 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : mylocation,
- 'name' : 'authrate',
- 'expectedRC' : expectedRC,
- 'knownIssue' : knownIssue
- }
- </call>
+ <sequence>
+ <call function="'runCommand'">
+ { 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : mylocation,
+ 'name' : 'authrate',
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
+ }
+ </call>
+
+ <script>
+ for line in STAXResult[0][1].split('\n'):
+ print line
+ </script>
+ </sequence>
</else>
</if>
- <script>
- for line in STAXResult[0][1].split('\n'):
- print line
- </script>
-
<return>
STAXResult
</return>
@@ -458,23 +460,25 @@
}
</call>
<else>
- <call function="'runCommand'">
- { 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : mylocation,
- 'name' : 'searchrate',
- 'expectedRC' : expectedRC,
- 'knownIssue' : knownIssue
- }
- </call>
+ <sequence>
+ <call function="'runCommand'">
+ { 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : mylocation,
+ 'name' : 'searchrate',
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
+ }
+ </call>
+
+ <script>
+ for line in STAXResult[0][1].split('\n'):
+ print line
+ </script>
+ </sequence>
</else>
</if>
- <script>
- for line in STAXResult[0][1].split('\n'):
- print line
- </script>
-
<return>
STAXResult
</return>
@@ -630,22 +634,24 @@
}
</call>
<else>
- <call function="'runCommand'">
- { 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : mylocation,
- 'name' : 'modrate',
- 'expectedRC' : expectedRC,
- 'knownIssue' : knownIssue
- }
- </call>
+ <sequence>
+ <call function="'runCommand'">
+ { 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : mylocation,
+ 'name' : 'modrate',
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
+ }
+ </call>
+
+ <script>
+ for line in STAXResult[0][1].split('\n'):
+ print line
+ </script>
+ </sequence>
</else>
</if>
-
- <script>
- for line in STAXResult[0][1].split('\n'):
- print line
- </script>
<return>
STAXResult
@@ -784,22 +790,24 @@
}
</call>
<else>
- <call function="'runCommand'">
- { 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : mylocation,
- 'name' : 'addrate',
- 'expectedRC' : expectedRC,
- 'knownIssue' : knownIssue
- }
- </call>
+ <sequence>
+ <call function="'runCommand'">
+ { 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : mylocation,
+ 'name' : 'addrate',
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
+ }
+ </call>
+
+ <script>
+ for line in STAXResult[0][1].split('\n'):
+ print line
+ </script>
+ </sequence>
</else>
</if>
-
- <script>
- for line in STAXResult[0][1].split('\n'):
- print line
- </script>
<return>
STAXResult
@@ -938,22 +946,24 @@
}
</call>
<else>
- <call function="'runCommand'">
- { 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : mylocation,
- 'name' : 'delrate',
- 'expectedRC' : expectedRC,
- 'knownIssue' : knownIssue
- }
- </call>
+ <sequence>
+ <call function="'runCommand'">
+ { 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : mylocation,
+ 'name' : 'delrate',
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
+ }
+ </call>
+
+ <script>
+ for line in STAXResult[0][1].split('\n'):
+ print line
+ </script>
+ </sequence>
</else>
</if>
-
- <script>
- for line in STAXResult[0][1].split('\n'):
- print line
- </script>
<return>
STAXResult
diff --git a/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml b/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
index d41c851..260aa9b 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
@@ -121,8 +121,7 @@
<!-- Test Suite Cleanup -->
<message>'Finally: Global Cleanup.'</message>
<try>
- <!--<call function="'common_cleanup'" />-->
- <message>'gfgd'</message>
+ <call function="'common_cleanup'" />
<catch exception="'STAFException'">
<sequence>
<message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>
--
Gitblit v1.10.0