runCommand should handle result as string or list

gary_williams

12.44.2008 2249e1cf53f23aec1040baabec49b6a1d5989338

runCommand should handle result as string or list

 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>