svn commit: r1813037 - /jmeter/trunk/bin/testfiles/FTP_TESTS.jmx

[pmouawad]

Author: pmouawad
Date: Mon Oct 23 15:58:46 2017
New Revision: 1813037

URL: http://svn.apache.org/viewvc?rev=1813037&view=rev
Log:
Bug 61642 - Improve FTP test coverage
Avoid error log on close error
Bugzilla Id: 61642

Modified:
    jmeter/trunk/bin/testfiles/FTP_TESTS.jmx

Modified: jmeter/trunk/bin/testfiles/FTP_TESTS.jmx
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/FTP_TESTS.jmx?rev=1813037&r1=1813036&r2=1813037&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/FTP_TESTS.jmx (original)
+++ jmeter/trunk/bin/testfiles/FTP_TESTS.jmx Mon Oct 23 15:58:46 2017
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="3.4" jmeter="3.4-SNAPSHOT.20171022">
+<jmeterTestPlan version="1.2" properties="3.4" jmeter="3.4-SNAPSHOT.20171023">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" 
enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -247,12 +247,16 @@ import org.apache.commons.io.FileUtils;
 FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), 
&quot;bin/ftp_test&quot;));
 
 FtpServer server = bsh.shared.myMap.get(&quot;FTP_SERVER&quot;);
-server.stop();
+try {
+       server.stop();
+} catch (Exception ex) {
+       log.info(&quot;Exception closing server&quot;, ex);
+}
 
 </stringProp>
           <stringProp name="BeanShellSampler.filename"></stringProp>
           <stringProp name="BeanShellSampler.parameters"></stringProp>
-          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
         <hashTree/>
       </hashTree>