Author: vladimirsitnikov Date: Wed May 29 11:59:57 2019 New Revision: 1860333
URL: http://svn.apache.org/viewvc?rev=1860333&view=rev Log: Test: delay JMS server shutdown in JMS_TESTS.jmx closes #464 Modified: jmeter/trunk/bin/testfiles/JMS_TESTS.jmx Modified: jmeter/trunk/bin/testfiles/JMS_TESTS.jmx URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/JMS_TESTS.jmx?rev=1860333&r1=1860332&r2=1860333&view=diff ============================================================================== --- jmeter/trunk/bin/testfiles/JMS_TESTS.jmx (original) +++ jmeter/trunk/bin/testfiles/JMS_TESTS.jmx Wed May 29 11:59:57 2019 @@ -1389,10 +1389,6 @@ propFloat 1.2</stringProp> <stringProp name="ThreadGroup.delay"></stringProp> </PostThreadGroup> <hashTree> - <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true"> - <stringProp name="ConstantTimer.delay">5100</stringProp> - </ConstantTimer> - <hashTree/> <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="BSS_stopActiveMQ" enabled="true"> <stringProp name="scriptLanguage">groovy</stringProp> <stringProp name="parameters"></stringProp> @@ -1403,9 +1399,15 @@ import org.apache.jmeter.util.JMeterUtil import org.apache.commons.io.FileUtils; BrokerService broker = props.get("ACTIVEMQ_BROKER"); -broker.stop(); - -FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), "bin/activemq-data")); +Thread.start { + // The delay is to allow for JMS Publishers to close resources in testEnded event + // Note: JMeter warns for non-daemon threads which are active + // So the sleep duration should be less than 2sec + // Otherwise "The following non-daemon threads are still running" is printed + sleep(700) + broker.stop() + FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), "bin/activemq-data")) +} </stringProp> </JSR223Sampler> <hashTree/>
