Author: fschumacher
Date: Thu Mar 23 21:07:53 2017
New Revision: 1788325
URL: http://svn.apache.org/viewvc?rev=1788325&view=rev
Log:
Add properties to skip tests, that fail in environments without proper internet
access, ie. are behind
a proxy. Contributed by Michael Osipov.
Bugzilla Id: 60886
Modified:
jmeter/trunk/README.md
jmeter/trunk/build.xml
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
jmeter/trunk/xdocs/building.xml
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/README.md
URL:
http://svn.apache.org/viewvc/jmeter/trunk/README.md?rev=1788325&r1=1788324&r2=1788325&view=diff
==============================================================================
--- jmeter/trunk/README.md (original)
+++ jmeter/trunk/README.md Thu Mar 23 21:07:53 2017
@@ -122,6 +122,18 @@ proxy.user=your_user_name
proxy.pass=your_password
```
+You might also want to skip some tests - that are failing without proper
access to the internet - by adding some more
+properties into `build-local.properties`:
+```
+skip.bug52310=true
+skip.bug60607=true
+skip.batchtest_Http4ImplPreemptiveBasicAuth=true
+skip.batchtest_SlowCharsFeature=true
+skip.batchtest_TestKeepAlive=true
+skip.test_http=true
+skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
+```
+
### Test builds
JMeter is built using Ant.
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1788325&r1=1788324&r2=1788325&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Mar 23 21:07:53 2017
@@ -119,7 +119,13 @@
<property name="findbugs.outName" value="reports/jmeter-fb" />
<property name="skip.batchtest" value="false" />
<property name="skip.bug52310" value="false" />
+ <property name="skip.bug60607" value="false" />
+ <property name="skip.batchtest_Http4ImplPreemptiveBasicAuth" value="false" />
+ <property name="skip.batchtest_SlowCharsFeature" value="false" />
+ <property name="skip.batchtest_TestKeepAlive" value="false" />
<property name="skip.test_https" value="true" />
+ <property name="skip.test_http" value="false" />
+ <property
name="skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server"
value="false" />
<target name="findbugs" description="Run the stand-alone Findbugs detector">
<echoproperties prefix="findbugs"/>
@@ -2719,11 +2725,13 @@ run JMeter unless all the JMeter jars ar
<antcall target="batchtest">
<param name="batchtest.name" value="Bug60607"/>
<param name="batchtest.jmx" value="Bug60607.jmx"/>
+ <param name="skip.batchtest" value="${skip.bug60607}" />
</antcall>
<antcall target="batchtest">
<param name="batchtest.name" value="SlowCharsFeature_HttpClient4"/>
<param name="batchtest.jmx" value="SlowCharsFeature.jmx"/>
+ <param name="skip.batchtest" value="${skip.batchtest_SlowCharsFeature}"
/>
</antcall>
<antcall target="batchtest">
@@ -2731,11 +2739,13 @@ run JMeter unless all the JMeter jars ar
<param name="batchtest.jmx" value="SlowCharsFeature.jmx"/>
<param name="batchtest.variable" value="jmeter.httpsampler"/>
<param name="batchtest.value" value="Java"/>
+ <param name="skip.batchtest" value="${skip.batchtest_SlowCharsFeature}"
/>
</antcall>
<antcall target="batchtest">
<param name="batchtest.name" value="Http4ImplPreemptiveBasicAuth"/>
<param name="batchtest.jmx" value="Http4ImplPreemptiveBasicAuth.jmx"/>
+ <param name="skip.batchtest"
value="${skip.batchtest_Http4ImplPreemptiveBasicAuth}" />
</antcall>
<antcall target="batchtest">
@@ -2743,11 +2753,13 @@ run JMeter unless all the JMeter jars ar
<param name="batchtest.jmx" value="Http4ImplPreemptiveBasicAuth.jmx"/>
<param name="batchtest.variable" value="jmeter.httpsampler"/>
<param name="batchtest.value" value="Java"/>
+ <param name="skip.batchtest"
value="${skip.batchtest_Http4ImplPreemptiveBasicAuth}" />
</antcall>
<antcall target="batchtest">
<param name="batchtest.name" value="TestKeepAlive"/>
<param name="batchtest.jmx" value="TestKeepAlive.jmx"/>
+ <param name="skip.batchtest" value="${skip.batchtest_TestKeepAlive}" />
</antcall>
<antcall target="batchtest">
@@ -2767,6 +2779,7 @@ run JMeter unless all the JMeter jars ar
<param name="batchtest.jmx" value="TEST_HTTP.jmx"/>
<param name="batchtest.variable" value="jmeter.httpsampler"/>
<param name="batchtest.value" value="HttpClient4"/>
+ <param name="skip.batchtest" value="${skip.test_http}" />
</antcall>
<antcall target="batchtest">
@@ -2776,6 +2789,7 @@ run JMeter unless all the JMeter jars ar
<param name="batchtest.value" value="Java"/>
<!-- This test contains a Redirection loop that leads to an error -->
<param name="batchtest.ignoreErrorLogs" value="true" />
+ <param name="skip.batchtest" value="${skip.test_http}" />
</antcall>
<antcall target="batchtest">
@@ -2847,6 +2861,8 @@ run JMeter unless all the JMeter jars ar
<sysproperty key="testsaveservice.saveout"
value="${testsaveservice.saveout}" />
<sysproperty key="gump.run" value="${gump.run}" />
<sysproperty key="log4j.configurationFile"
value="${basedir}/bin/log4j2.xml" />
+ <sysproperty
key="skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server"
+
value="${skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server}" />
<arg value="${build.test}"/>
<arg value="${basedir}/bin/jmeter.properties"/>
<arg value="org.apache.jmeter.util.JMeterUtils"/>
Modified:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java?rev=1788325&r1=1788324&r2=1788325&view=diff
==============================================================================
---
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
(original)
+++
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
Thu Mar 23 21:07:53 2017
@@ -20,6 +20,7 @@ package org.apache.jmeter.protocol.http.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -94,6 +95,7 @@ public class TestDNSCacheManager extends
@Test
public void testWithCustomResolverAnd1Server() throws UnknownHostException
{
+
assumeTrue(!Boolean.getBoolean("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server"));
DNSCacheManager original = new DNSCacheManager();
original.addServer(VALID_DNS_SERVER);
original.setCustomResolver(true);
Modified: jmeter/trunk/xdocs/building.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/building.xml?rev=1788325&r1=1788324&r2=1788325&view=diff
==============================================================================
--- jmeter/trunk/xdocs/building.xml (original)
+++ jmeter/trunk/xdocs/building.xml Thu Mar 23 21:07:53 2017
@@ -59,13 +59,24 @@ ant download_jars
This will retrieve any missing jars.
</p>
<note>
-If you are behind a proxy, you can set a few build properties for ant to use
the proxy:
+If you are behind a proxy, you can set a few build properties in
<code>build-local.properties</code> for ant to use the proxy:
<source>
proxy.host=proxy.example.invalid
proxy.port=8080
proxy.user=your_user_name
proxy.pass=your_password
</source>
+You might also want to skip some tests - that are failing without proper
access to the internet - by adding some more
+properties into <code>build-local.properties</code>:
+<source>
+skip.bug52310=true
+skip.bug60607=true
+skip.batchtest_Http4ImplPreemptiveBasicAuth=true
+skip.batchtest_SlowCharsFeature=true
+skip.batchtest_TestKeepAlive=true
+skip.test_http=true
+skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
+</source>
</note>
<p>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1788325&r1=1788324&r2=1788325&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Mar 23 21:07:53 2017
@@ -313,7 +313,7 @@ listeners hold and a rework of the way G
<li><bug>60813</bug>JSR223 Test element : Take into account
JMeterStopTestNowException, JMeterStopTestException and
JMeterStopThreadException</li>
<li><bug>60814</bug>Menu : Add <code>Open Recent</code> menu item to make
recent files loading more obvious</li>
<li><bug>60815</bug>Drop "Reset GUI" from menu</li>
- <li><bug>60886</bug>Build improvements to better enable builds in
environments that are behind a proxy.</li>
+ <li><bug>60886</bug>Build improvements to better enable builds in
environments that are behind a proxy. Partly contributed by Michael Osipov
(1983-01-06 at gmx.net)</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -440,6 +440,7 @@ listeners hold and a rework of the way G
<li>Woonsan Ko (woonsan at apache.org)</li>
<li>Bartosz Siewniak (barteksiewniak at gmail.com)</li>
<li>Kimono (kimono.outfit.am at gmail.com)</li>
+<li>Michael Osipov (1983-01-06 at gmx.net)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter. <br/>
For this release we want to give special thanks to the following reporters for
the clear reports and tests made after our fixes:</p>
