mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

ugaston
31.24.2009 3a1d1148438919c266cac7c1e5bf97c6d0a2023a
Functional tests: Remove location argument from Sleep() function
8 files modified
87 ■■■■ changed files
opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml 3 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml 42 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml 16 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml 6 ●●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml 3 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml 6 ●●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml 3 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/shared/functions/utils.xml 8 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
@@ -228,8 +228,7 @@
                  </call>
  
                  <call function="'Sleep'">
                    { 'location'             : STAF_REMOTE_HOSTNAME,
                      'sleepForMilliSeconds' : 5000 }
                    { 'sleepForMilliSeconds' : 5000 }
                  </call>
  
                  <call function="'listFolder'">
opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
@@ -131,9 +131,7 @@
              <!-- Let some time for the change to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>
                                
              <!-- Search changelog in the various replication servers -->                                                           
@@ -273,9 +271,7 @@
                                              
              <!-- Let some time for the change to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>
                              
              <!-- Export changelog in the various replication servers, then
@@ -399,9 +395,7 @@
              <!-- Let some time for the change to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>
                                
              <!-- Stop the servers in the topology -->
@@ -483,9 +477,7 @@
              <!-- Let some time for the change to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>
                                
              <!-- Stop the servers in the topology -->
@@ -745,12 +737,10 @@
              <!-- Let some time for the change to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>                
                
              <!-- Backup changelog in the various replication servers -->
              <!-- Backup changelog in the various replication servers -->
              <paralleliterate var="server" 
                               in="_topologyServerList" 
                               indexvar="i">
@@ -814,13 +804,11 @@
              <!-- Let some time for the change to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>                                                              
              <!-- Restore changelog_backup_online in the various replication 
                servers, then restore master_backup in every server -->
                servers, then restore master_backup in every server -->
              <paralleliterate var="server" 
                               in="_topologyServerList" 
                               indexvar="i">
@@ -1069,9 +1057,7 @@
                                          
              <!-- Let some time for the change to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>
                
              <!-- Search changelog in the various replication servers -->                                                           
@@ -1325,12 +1311,10 @@
                                                  
              <!-- Let some time for the changes to propagate -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  2000
                }
                { 'sleepForMilliSeconds' :  2000 }
              </call>
                
              <!-- Search changelog in the various replication servers -->
              <!-- Search changelog in the various replication servers -->
              <paralleliterate var="server" 
                               in="_topologyServerList" 
                               indexvar="i">
@@ -1377,9 +1361,7 @@
              <!-- Let the purge delay expire: sleep for 60s -->
              <call function="'Sleep'">
                { 'location'             :  masterHost,
                  'sleepForMilliSeconds' :  60000
                }
                { 'sleepForMilliSeconds' :  60000 }
              </call>
                
              <!-- Search changelog in the various replication servers -->                                                           
opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
@@ -480,9 +480,7 @@
              </call>                                                                  
              <call function="'Sleep'">
                { 'location'  :  masterHost,
                  'sleepForMilliSeconds'  :  1000
                }
                { 'sleepForMilliSeconds'  :  1000 }
              </call>
                
              <!-- Add entry to "consumer" server -->                       
@@ -573,9 +571,7 @@
              </call>                                                                                                     
              <call function="'Sleep'">
                { 'location'  :  masterHost,
                  'sleepForMilliSeconds'  :  1000
                }
                { 'sleepForMilliSeconds'  :  1000 }
              </call>
                                
              <!-- Add entry to "consumer" server -->                       
@@ -682,9 +678,7 @@
              </call>
                                
              <call function="'Sleep'">
                { 'location'  :  masterHost,
                  'sleepForMilliSeconds'  :  1000
                }
                { 'sleepForMilliSeconds'  :  1000 }
              </call>
                                
              <!-- Try to add entry to servers; should be rejected with error 65
@@ -785,9 +779,7 @@
              </call>                     
              <call function="'Sleep'">
                { 'location'  :  masterHost,
                  'sleepForMilliSeconds'  :  1000
                }
                { 'sleepForMilliSeconds'  :  1000 }
              </call>
                                                                                                                                
              <!-- Try to add entry to servers; should be rejected with error 65
opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
@@ -129,8 +129,7 @@
              </call>
  
              <call function="'Sleep'">
                { 'location'  :  STAF_REMOTE_HOSTNAME,
                'sleepForMilliSeconds'  :  120000 }
                { 'sleepForMilliSeconds'  :  120000 }
              </call>
  
              <!-- manage-tasks -->
@@ -460,8 +459,7 @@
              </call>
  
              <call function="'Sleep'">
                { 'location'  :  STAF_REMOTE_HOSTNAME,
                'sleepForMilliSeconds'  :  120000 }
                { 'sleepForMilliSeconds'  :  120000 }
              </call>
  
              <!-- manage-tasks -->
opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -321,8 +321,7 @@
              </call>
  
              <call function="'Sleep'">
                { 'location'  :  STAF_REMOTE_HOSTNAME,
                'sleepForMilliSeconds'  :  120000 }
                { 'sleepForMilliSeconds'  :  120000 }
              </call>
  
              <!-- manage-tasks -->
opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -162,8 +162,7 @@
                'dsBackEnd'           : DIRECTORY_INSTANCE_BE}
              </call>
              <call function="'Sleep'">
                { 'location'  :  STAF_REMOTE_HOSTNAME,
                'sleepForMilliSeconds'  :  40000 }
                { 'sleepForMilliSeconds'  :  40000 }
              </call>
              
              <!--  Check data are imported -->
@@ -313,8 +312,7 @@
              </call>
  
              <call function="'Sleep'">
                { 'location'  :  STAF_REMOTE_HOSTNAME,
                'sleepForMilliSeconds'  :  120000 }
                { 'sleepForMilliSeconds'  :  120000 }
              </call>
  
              <!-- manage-tasks -->
opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
@@ -255,8 +255,7 @@
              </call>
  
              <call function="'Sleep'">
                { 'location'  :  STAF_REMOTE_HOSTNAME,
                'sleepForMilliSeconds'  :  120000 }
                { 'sleepForMilliSeconds'  :  120000 }
              </call>
  
              <!-- manage-tasks -->
opends/tests/staf-tests/shared/functions/utils.xml
@@ -689,12 +689,6 @@
      Sleep for number of milliseconds
    </function-prolog>
    <function-map-args>
      <function-arg-def name="location" type="optional" default="STAXServiceMachine">
        <function-arg-description>
          Location of target host
      </function-arg-description>
      <function-arg-property name="type" value="hostname"/>
      </function-arg-def>
      <function-arg-def name="sleepForMilliSeconds" type="required">
        <function-arg-description>
          Number of milliseconds to sleep
@@ -705,7 +699,7 @@
    
    <sequence>
      <stafcmd name="'STAF Command: Delay'">
        <location>'%s' % location</location>
        <location>STAXServiceMachine</location>
        <service>'delay'</service>
        <request>
          'delay %i' % sleepForMilliSeconds