You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2016/05/04 20:40:41 UTC

svn commit: r1742333 - in /jmeter/trunk: bin/templates/recording-with-think-time.jmx bin/templates/recording.jmx src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java xdocs/changes.xml

Author: sebb
Date: Wed May  4 20:40:41 2016
New Revision: 1742333

URL: http://svn.apache.org/viewvc?rev=1742333&view=rev
Log:
Revert r1734313 so default action remains as 'Continue'
Bugzilla Id: 59152

Modified:
    jmeter/trunk/bin/templates/recording-with-think-time.jmx
    jmeter/trunk/bin/templates/recording.jmx
    jmeter/trunk/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/templates/recording-with-think-time.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/recording-with-think-time.jmx?rev=1742333&r1=1742332&r2=1742333&view=diff
==============================================================================
--- jmeter/trunk/bin/templates/recording-with-think-time.jmx (original)
+++ jmeter/trunk/bin/templates/recording-with-think-time.jmx Wed May  4 20:40:41 2016
@@ -37,7 +37,7 @@
       </CookieManager>
       <hashTree/>
       <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
-        <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>

Modified: jmeter/trunk/bin/templates/recording.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/recording.jmx?rev=1742333&r1=1742332&r2=1742333&view=diff
==============================================================================
--- jmeter/trunk/bin/templates/recording.jmx (original)
+++ jmeter/trunk/bin/templates/recording.jmx Wed May  4 20:40:41 2016
@@ -37,7 +37,7 @@
       </CookieManager>
       <hashTree/>
       <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
-        <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java?rev=1742333&r1=1742332&r2=1742333&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/gui/AbstractThreadGroupGui.java Wed May  4 20:40:41 2016
@@ -132,7 +132,7 @@ public abstract class AbstractThreadGrou
     }
     
     private void initGui() {
-        startNextLoop.setSelected(true);
+        continueBox.setSelected(true);
     }
 
     private JPanel createOnErrorPanel() {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1742333&r1=1742332&r2=1742333&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed May  4 20:40:41 2016
@@ -283,7 +283,6 @@ Deprecated Libraries dropped or replaced
     </ul>
     </li>
     <li><code>httpsampler.await_termination_timeout</code> has been replaced by <code>httpsampler.parallel_download_thread_keepalive_inseconds</code> which is now the keep alive time for the parallel download threads (in seconds).</li>
-    <li>For Thread Group Test Element, the property "<code>Action to be taken after a Sample Error</code>" value has been switched from "<code>Continue</code>" to "<code>Start Next thread loop</code>". See <bugzilla>59152</bugzilla></li>
     <li>JDBC Request has been updated to use commons-dbcp2, since then the behaviour is slightly different, ensure you have a correct "Validation Query" for your database. See <bugzilla>58786</bugzilla></li>
     <li>The following jars have been removed:
     <ul>
@@ -458,7 +457,6 @@ Deprecated Libraries dropped or replaced
 <li><bug>58715</bug>Feature request: Bundle <code>groovy-all</code> with JMeter</li>
 <li><bug>58426</bug>Improve display of JMeter on high resolution devices (HiDPI) (part 1 of enhancement)</li>
 <li><bug>59105</bug>TableEditor : Add ability to paste rows from clipboard and delete multiple selection. Contributed by Vincent Herilier (vherilier at gmail.com)</li>
-<li><bug>59152</bug>Thread Group: Change "<code>Action to be taken after a Sample Error</code>" value from "<code>Continue</code>" to "<code>Start Next thread loop</code>". Contributed by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
 <li><bug>59197</bug>Thread Group : it should be possible to only run a single threadgroup or a selection of threadgroups with a popup menu. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
 <li><bug>59207</bug>Change the font color of <code>errorsOrFatalsLabel</code> to red when an error occurs. Contributed by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
 <li><bug>58941</bug>Create a new Starter that runs thread groups in validation mode (<code>1</code> thread only, <code>1</code> iteration, no pause all customizable)</li>