Setting execution granularity at Suite level: Part 2

ugaston

18.47.2007 b643c10a26a80d6270e53229ff61cc730e5a748e

 opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml

@@ -31,77 +31,59 @@

  <function name="security_startTLS">

   <sequence>
    <sequence>

     <block name="'start-tls'">

  	  
       <sequence>

         <script>
  	      	  
          <script>
            if not CurrentTestPath.has_key('group'):
              CurrentTestPath['group']='security'								  							  			  
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>

         <call function="'testSuite_Preamble'" />

         <!--- Start DS -->
         <message>
           'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
         </message>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/security/security_setup.xml' % (TESTS_DIR)"/>
          <call function="'security_setup'"/>

         <!--- Start DS -->
         <call function="'StartDsWithScript'">
           { 'location' : STAF_REMOTE_HOSTNAME }
         </call>
								        

         <call function="'checkRC'">
           { 'returncode' : RC , 'result' : STAXResult }
         </call>

         <!--- Check that DS started -->
         <call function="'isAlive'">
           { 'noOfLoops' : 5 , 'noOfMilliSeconds' : 2000 }
         </call>
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'setup_startTLS'" />

         <import machine="'%s' % STAF_LOCAL_HOSTNAME"
           file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)" />
         <call function="'setup_startTLS'" />
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'bob_startTLS'" />
    
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'force_pwd_change_startTLS'" />

         <import machine="'%s' % STAF_LOCAL_HOSTNAME"
           file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)" />
         <call function="'bob_startTLS'" />
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)"/>
          <call function="'teardown_startTLS'" />
 

         <import machine="'%s' % STAF_LOCAL_HOSTNAME"
           file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)" />
         <call function="'force_pwd_change_startTLS'" />

         <import machine="'%s' % STAF_LOCAL_HOSTNAME"
           file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)" />
         <call function="'teardown_startTLS'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/security/security_cleanup.xml' % (TESTS_DIR)"/>
          <call function="'security_cleanup'"/>

         <!--- Stop DS -->
         <message>
           'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
         </message>
								

         <call function="'StopDsWithScript'">
           { 'location'  : STAF_REMOTE_HOSTNAME, 
              'dsHost'    : DIRECTORY_INSTANCE_HOST,
              'dsPort'    : DIRECTORY_INSTANCE_PORT, 
              'dsBindDN'  : DIRECTORY_INSTANCE_DN, 
              'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
         </call>

         <call function="'checkRC'">
           { 'returncode' : RC , 'result' : STAXResult }
         </call>

         <call function="'testSuite_Postamble'" />
          <call function="'testSuite_Postamble'"/>

       </sequence>

     </block>

   </sequence>
        
    </sequence>

  </function>