Author: pmouawad
Date: Wed Jan 16 22:33:47 2019
New Revision: 1851489
URL: http://svn.apache.org/viewvc?rev=1851489&view=rev
Log:
Bug 63081 - Command line Option '-f' does not delete report folder when using
generation only (-g)
Contributed by UbikLoadPack
Bugzilla Id: 63081
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1851489&r1=1851488&r2=1851489&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Wed Jan 16 22:33:47 2019
@@ -351,7 +351,7 @@ public class JMeter implements JMeterPlu
/** should remote engines be stopped at end of non-GUI test? */
private boolean remoteStop;
- /** should delete result file before start ? */
+ /** should delete result file / report folder before start ? */
private boolean deleteResultFile = false;
public JMeter() {
@@ -537,7 +537,7 @@ public class JMeter implements JMeterPlu
CLOption testReportOpt =
parser.getArgumentById(REPORT_GENERATING_OPT);
if (testReportOpt != null) { // generate report from existing
file
String reportFile = testReportOpt.getArgument();
- extractAndSetReportOutputFolder(parser, false);
+ extractAndSetReportOutputFolder(parser, deleteResultFile);
ReportGenerator generator = new
ReportGenerator(reportFile, null);
generator.generate();
} else if (parser.getArgumentById(NONGUI_OPT) == null) { //
not non-GUI => GUI
@@ -580,16 +580,17 @@ public class JMeter implements JMeterPlu
* {@link JMeter#JMETER_REPORT_OUTPUT_DIR_PROPERTY} after checking folder
can
* be safely written to
* @param parser {@link CLArgsParser}
+ * @param deleteReportFolder true means delete report folder
* @throws IllegalArgumentException
*/
- private void extractAndSetReportOutputFolder(CLArgsParser parser, boolean
deleteResultFile) {
+ private void extractAndSetReportOutputFolder(CLArgsParser parser, boolean
deleteReportFolder) {
CLOption reportOutputFolderOpt = parser
.getArgumentById(REPORT_OUTPUT_FOLDER_OPT);
if(reportOutputFolderOpt != null) {
String reportOutputFolder =
parser.getArgumentById(REPORT_OUTPUT_FOLDER_OPT).getArgument();
File reportOutputFolderAsFile = new File(reportOutputFolder);
- JOrphanUtils.canSafelyWriteToFolder(reportOutputFolderAsFile,
deleteResultFile);
+ JOrphanUtils.canSafelyWriteToFolder(reportOutputFolderAsFile,
deleteReportFolder);
final String reportOutputFolderAbsPath =
reportOutputFolderAsFile.getAbsolutePath();
log.info("Setting property '{}' to:'{}'",
JMETER_REPORT_OUTPUT_DIR_PROPERTY, reportOutputFolderAbsPath);
JMeterUtils.setProperty(JMETER_REPORT_OUTPUT_DIR_PROPERTY,
reportOutputFolderAbsPath);
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1851489&r1=1851488&r2=1851489&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Jan 16 22:33:47 2019
@@ -118,6 +118,7 @@ of previous time slot as a base. Startin
<li><bug>62883</bug>Report / Dashboard : Change the way percentiles are
computed for Response Time Percentiles Over Time (successful responses)
graph</li>
<li><bug>63060</bug>Report Generator: A generator should only check for
folder/files it generates and only delete those ones</li>
<li><bug>63059</bug>Create a new JsonExporter that exports as JSON the
content of data computed for HTML Dashboard Statistics table. Contributed by
Ubik Load Pack (support at ubikloadpack.com)</li>
+ <li><bug>63081</bug>Command line Option <code>-f</code> does not delete
report folder when using generation only through command line option
<code>-g</code>. Contributed by Ubik Load Pack (support at
ubikloadpack.com)</li>
</ul>
<h3>General</h3>
