svn commit: r926423 - in /websites/staging/slider/trunk/content: ./ developing/functional_tests.html

[buildbot]

Author: buildbot
Date: Wed Oct 22 09:31:28 2014
New Revision: 926423

Log:
Staging update by buildbot for slider

Modified:
    websites/staging/slider/trunk/content/   (props changed)
    websites/staging/slider/trunk/content/developing/functional_tests.html

Propchange: websites/staging/slider/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 22 09:31:28 2014
@@ -1 +1 @@
-1633372
+1633573

Modified: websites/staging/slider/trunk/content/developing/functional_tests.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/functional_tests.html 
(original)
+++ websites/staging/slider/trunk/content/developing/functional_tests.html Wed 
Oct 22 09:31:28 2014
@@ -296,8 +296,10 @@ need to be changed</p>
 
  <span class="nt">&lt;property&gt;</span>
   <span class="nt">&lt;name&gt;</span>slider.test.timeout.millisec<span 
class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;description&gt;</span>Time out in milliseconds before a 
test is considered to have failed.
-  There are some maven properties which also define limits and may need 
adjusting<span class="nt">&lt;/description&gt;</span>
+  <span class="nt">&lt;description&gt;</span>
+  Time out in milliseconds before a test is considered to have failed.
+  There are some maven properties which also define limits and may need 
adjusting
+  <span class="nt">&lt;/description&gt;</span>
   <span class="nt">&lt;value&gt;</span>180000<span 
class="nt">&lt;/value&gt;</span>
 <span class="nt">&lt;/property&gt;</span>
 
@@ -306,6 +308,15 @@ need to be changed</p>
   <span class="nt">&lt;description&gt;</span>Size in MB to ask for 
containers<span class="nt">&lt;/description&gt;</span>
   <span class="nt">&lt;value&gt;</span>192<span 
class="nt">&lt;/value&gt;</span>
 <span class="nt">&lt;/property&gt;</span>
+
+ <span class="nt">&lt;property&gt;</span>
+  <span class="nt">&lt;name&gt;</span>slider.test.launch.python<span 
class="nt">&lt;/name&gt;</span>
+  <span class="nt">&lt;description&gt;</span>
+  Flag to mandate use of the slider.py script.
+  Ignored on windows —which always uses the python script
+  <span class="nt">&lt;/description&gt;</span>
+  <span class="nt">&lt;value&gt;</span>false<span 
class="nt">&lt;/value&gt;</span>
+<span class="nt">&lt;/property&gt;</span>
 </pre></div>