harden the DSML functional-tests

gary_williams

20.54.2009 5c73b681a27a6b5e5d1e96a809cfdbb0cdb7ca4c

harden the DSML functional-tests

 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml

@@ -30,6 +30,8 @@
  <function name="dsml_test">
    <block name="'test'">
      <sequence>
        <try>
          <sequence>
        <!--- Test Suite information
          #@TestSuiteName       test
          #@TestSuitePurpose    test for the dsml test suite.
@@ -134,6 +136,11 @@
            <iterate var="test" in="familyInput">
              <testcase name="getTestCaseName('%s-%s' % (family,test))">
                <sequence>
                      <try>
                        <sequence>
                          <message>
                             'Test Name = %s' % STAXCurrentTestcase
                          </message>
                  <call function="'testCase_Preamble'"/>
                  <script>
                    runFileName = runFileRE.sub('run',test)
@@ -195,12 +202,25 @@
                    }
                  </call>

                          <!-- Check the STAFResult is expected class type -->
                          <if expr='STAFResult.__class__ is not org.python.core.PyDictionary'>
                            <sequence>
                              <message log="1" level="'Error'">
                                'ERROR : Invalid result type (%s), requires org.python.core.PyDictionary.' % STAFResult.__class__
                              </message>
                              <throw exception="'STAXException.Results.TestCaseException'">
                                'Result not a PyDictionary object.'
                              </throw>
                            </sequence>
                          </if>

                  <call function="'checktestRC'">
                    {
                    'returncode' : RC ,
                    'result'     : STAFResult
                    }
                  </call>

                  <if expr="result['statusCode'] == '200'">
                    <sequence>
                      <script>
@@ -243,15 +263,35 @@
                      </call>
                    </else>
                  </if>

                        </sequence>
                        <catch exception="'...'" typevar="eType" var="eInfo">
                          <sequence>
                            <message log="1" level="'fatal'">
                              'Test case (%s) failed. eType(%s),eInfo(%s)' % (STAXCurrentTestcase,eType,eInfo)
                            </message>
                            <tcstatus result="'fail'"/>
                          </sequence>
                        </catch>
                        <finally>
                  <call function="'testCase_Postamble'"/>
                        </finally>
                      </try>
                </sequence>
              </testcase>
            </iterate>
          </sequence>
        </iterate>

          </sequence>
          <catch exception="'...'" typevar="eType" var="eInfo">
            <message log="1" level="'fatal'">
              'Test suite (%s) failed. eType(%s),eInfo(%s)' % (CurrentTestPath['suite'],eType,eInfo)
            </message>
          </catch>
          <finally>
        <call function="'testSuite_Postamble'"/>
          </finally>
        </try>
      </sequence>
    </block>
  </function>