From 9ba344132350f44446a39367691e672ee7267591 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 12 Mar 2008 16:44:19 +0000
Subject: [PATCH] runCommand should handle result as string or list
---
opendj-sdk/opends/tests/shared/functions/utils.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/tests/shared/functions/utils.xml b/opendj-sdk/opends/tests/shared/functions/utils.xml
index 927d2e2..cab3b82 100755
--- a/opendj-sdk/opends/tests/shared/functions/utils.xml
+++ b/opendj-sdk/opends/tests/shared/functions/utils.xml
@@ -1523,14 +1523,23 @@
</else>
</if>
+ <!-- The problem here is that STAXResult can either be a
+ string, list or a map object -->
<script>
- cmdRC = RC
- cmdOutput = STAXResult
+ try:
+ cmdOutput=STAXResult[0][1]
+ cmdRC = RC
+ except:
+ cmdOutput=STAXResult
+ cmdRC = RC
+
+ cmdResult=STAXResult
</script>
+
<if expr="expectedRC != 'noCheck'">
<call function="'checktestRC'">
{ 'returncode' : cmdRC,
- 'result' : cmdOutput[0][1],
+ 'result' : cmdOutput,
'expected' : expectedRC
}
</call>
@@ -1551,10 +1560,10 @@
return 'could not evaluate the following component: %s' % var
if stripOutput == True:
- cmdOutput=dig(cmdOutput)
+ cmdResult=dig(cmdResult)
</script>
<return>
- cmdOutput
+ cmdResult
</return>
</sequence>
</function>
--
Gitblit v1.10.0