You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/05 15:28:37 UTC
svn commit: r1657580 - in /tomcat/trunk: build.xml
test/org/apache/catalina/valves/TesterAccessLogValve.java
Author: markt
Date: Thu Feb 5 14:28:37 2015
New Revision: 1657580
URL: http://svn.apache.org/r1657580
Log:
First pass at reducing false failures on CI system.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1657580&r1=1657579&r2=1657580&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Feb 5 14:28:37 2015
@@ -168,6 +168,7 @@
<!-- Tests To Run -->
<property name="test.name" value="**/Test*.java"/>
<property name="test.formatter" value="-Dorg.apache.juli.formatter=java.util.logging.SimpleFormatter"/>
+ <property name="test.relaxTiming" value="false"/>
<!-- Cobertura code coverage settings -->
<property name="cobertura.out" value="${tomcat.output}/coverage"/>
@@ -1413,6 +1414,7 @@
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" />
<sysproperty key="tomcat.test.reports" value="${test.reports}" />
<sysproperty key="tomcat.test.openssl.path" value="${test.openssl.path}" />
+ <sysproperty key="tomcat.test.relaxTiming" value="${test.relaxTiming}" />
<!-- File for Cobertura to write coverage results to -->
<sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}" />
@@ -1436,7 +1438,9 @@
<!-- Exclude the tests known to fail -->
<exclude name="org/apache/catalina/tribes/test/**" />
<!-- Exclude the OpenSSL tests unless OpenSSL is available -->
- <exclude name="org/apache/tomcat/util/net/jsse/openssl/**" unless="${test.openssl.exists}"/>
+ <exclude name="org/apache/tomcat/util/net/jsse/openssl/**" unless="${test.openssl.exists}" />
+ <!-- Exclude performance tests. E.g. on systems with slow/inconsistent timing -->
+ <exclude name="**/*Performance.java" if="${test.excludePerformance}" />
</fileset>
</batchtest>
</junit>
Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580&r1=1657579&r2=1657580&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu Feb 5 14:28:37 2015
@@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res
public class TesterAccessLogValve extends ValveBase implements AccessLog {
- // Timing tests need a small error margin to prevent failures
- private static final long ERROR_MARGIN = 500;
+ private static boolean RELAX_TIMING = Boolean.getBoolean("tomcat.test.relaxTiming");
+
+ // Timing tests need an error margin to prevent failures.
+ private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;
private final List<Entry> entries = new ArrayList<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1657580 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/TesterAccessLogValve.java
Posted by Mark Thomas <ma...@apache.org>.
On 05/02/2015 14:40, Mark Thomas wrote:
> On 05/02/2015 14:36, Konstantin Kolinko wrote:
>> 2015-02-05 17:28 GMT+03:00 <ma...@apache.org>:
>>> Author: markt
>>> Date: Thu Feb 5 14:28:37 2015
>>> New Revision: 1657580
>>>
>>> URL: http://svn.apache.org/r1657580
>>> Log:
>>> First pass at reducing false failures on CI system.
>>>
>>> Modified:
>>> tomcat/trunk/build.xml
>>> tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
>>>
>>
>>> Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
>>> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580&r1=1657579&r2=1657580&view=diff
>>> ==============================================================================
>>> --- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original)
>>> +++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu Feb 5 14:28:37 2015
>>> @@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res
>>>
>>> public class TesterAccessLogValve extends ValveBase implements AccessLog {
>>>
>>> - // Timing tests need a small error margin to prevent failures
>>> - private static final long ERROR_MARGIN = 500;
>>> + private static boolean RELAX_TIMING = Boolean.getBoolean("tomcat.test.relaxTiming");
>>
>> 1. "final" above
>
> Done.
>
>>> + // Timing tests need an error margin to prevent failures.
>>> + private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;
>>>
>>> private final List<Entry> entries = new ArrayList<>();
>>
>>
>> 2. Mention the new "test.relaxTiming" build property in BUILDING.txt
>> -> "(7.3) Other configuration options"
>
> Will do.
>
>> 3. System.out.println() added in
>> http://svn.apache.org/r1657492
>> can be replaced by log.info(). The log is available is the test class
>> inherits from o.a.c.startup.LoggingBaseTest.
>
> Grr. That wasn't meant to get committed. It is just me checking that the
> config took effect.
Ah. wrong System.out.println(). I'll get that one changed.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1657580 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/TesterAccessLogValve.java
Posted by Mark Thomas <ma...@apache.org>.
On 05/02/2015 14:36, Konstantin Kolinko wrote:
> 2015-02-05 17:28 GMT+03:00 <ma...@apache.org>:
>> Author: markt
>> Date: Thu Feb 5 14:28:37 2015
>> New Revision: 1657580
>>
>> URL: http://svn.apache.org/r1657580
>> Log:
>> First pass at reducing false failures on CI system.
>>
>> Modified:
>> tomcat/trunk/build.xml
>> tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
>>
>
>> Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580&r1=1657579&r2=1657580&view=diff
>> ==============================================================================
>> --- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original)
>> +++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu Feb 5 14:28:37 2015
>> @@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res
>>
>> public class TesterAccessLogValve extends ValveBase implements AccessLog {
>>
>> - // Timing tests need a small error margin to prevent failures
>> - private static final long ERROR_MARGIN = 500;
>> + private static boolean RELAX_TIMING = Boolean.getBoolean("tomcat.test.relaxTiming");
>
> 1. "final" above
Done.
>> + // Timing tests need an error margin to prevent failures.
>> + private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;
>>
>> private final List<Entry> entries = new ArrayList<>();
>
>
> 2. Mention the new "test.relaxTiming" build property in BUILDING.txt
> -> "(7.3) Other configuration options"
Will do.
> 3. System.out.println() added in
> http://svn.apache.org/r1657492
> can be replaced by log.info(). The log is available is the test class
> inherits from o.a.c.startup.LoggingBaseTest.
Grr. That wasn't meant to get committed. It is just me checking that the
config took effect.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1657580 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/TesterAccessLogValve.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2015-02-05 17:28 GMT+03:00 <ma...@apache.org>:
> Author: markt
> Date: Thu Feb 5 14:28:37 2015
> New Revision: 1657580
>
> URL: http://svn.apache.org/r1657580
> Log:
> First pass at reducing false failures on CI system.
>
> Modified:
> tomcat/trunk/build.xml
> tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
>
> Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580&r1=1657579&r2=1657580&view=diff
> ==============================================================================
> --- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original)
> +++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu Feb 5 14:28:37 2015
> @@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res
>
> public class TesterAccessLogValve extends ValveBase implements AccessLog {
>
> - // Timing tests need a small error margin to prevent failures
> - private static final long ERROR_MARGIN = 500;
> + private static boolean RELAX_TIMING = Boolean.getBoolean("tomcat.test.relaxTiming");
1. "final" above
> + // Timing tests need an error margin to prevent failures.
> + private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;
>
> private final List<Entry> entries = new ArrayList<>();
2. Mention the new "test.relaxTiming" build property in BUILDING.txt
-> "(7.3) Other configuration options"
3. System.out.println() added in
http://svn.apache.org/r1657492
can be replaced by log.info(). The log is available is the test class
inherits from o.a.c.startup.LoggingBaseTest.
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org