diff options
Diffstat (limited to 'qpid/java/test-profiles')
| -rw-r--r-- | qpid/java/test-profiles/JavaExcludes | 3 | ||||
| -rw-r--r-- | qpid/java/test-profiles/python_tests/Java010PythonExcludes | 2 | ||||
| -rw-r--r-- | qpid/java/test-profiles/test_resources/log4j.xml | 53 | ||||
| -rw-r--r-- | qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml (renamed from qpid/java/test-profiles/log4j-test.xml) | 10 |
4 files changed, 56 insertions, 12 deletions
diff --git a/qpid/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes index c4b864fb5f..b52987f369 100644 --- a/qpid/java/test-profiles/JavaExcludes +++ b/qpid/java/test-profiles/JavaExcludes @@ -24,9 +24,6 @@ org.apache.qpid.client.SessionCreateTest#* org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy -//QPID-3605 Durable subscriber with no-local true receives messages on re-connection -org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testNoLocalMessagesNotDeliveredAfterReconnection - //QPID-4153 Messages causing a runtime selector error should be dead-lettered (or something similar) org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError diff --git a/qpid/java/test-profiles/python_tests/Java010PythonExcludes b/qpid/java/test-profiles/python_tests/Java010PythonExcludes index 90082540a7..530caad132 100644 --- a/qpid/java/test-profiles/python_tests/Java010PythonExcludes +++ b/qpid/java/test-profiles/python_tests/Java010PythonExcludes @@ -53,6 +53,8 @@ qpid_tests.broker_0_10.extensions.ExtensionTests.test_timed_autodelete qpid_tests.broker_0_10.priority.PriorityTests.test_ring_queue* qpid_tests.broker_0_10.priority.PriorityTests.test_fairshare* qpid_tests.broker_0_10.priority.PriorityTests.test_prioritised_delivery_with_alias +#QPID-6299 broker does not support ring queue on lvq +qpid_tests.broker_0_10.lvq.LVQTests.test_ring_lvq2 #The broker does not support the autodelete property on exchanges qpid_tests.broker_0_10.exchange.AutodeleteTests.testAutodelete* diff --git a/qpid/java/test-profiles/test_resources/log4j.xml b/qpid/java/test-profiles/test_resources/log4j.xml new file mode 100644 index 0000000000..8c59ffdd98 --- /dev/null +++ b/qpid/java/test-profiles/test_resources/log4j.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="null" threshold="null"> + + + + <appender class="org.apache.log4j.FileAppender" name="TestAppender"> + <param name="File" value="${test.output.dir}${file.separator}TEST-${qpid.testClass}${qpid.testMethod}.txt"/> + <param name="Append" value="false"/> + + + <!-- TODO date not interesting for test debugging. log only the time to save width --> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%t] (%c{2}) - %m%n"/> + </layout> + </appender> + + + <!-- General logging hierarchy --> + <logger name="org.apache.qpid"> + <level value="${amqj.logging.level}"/> + </logger> + + <logger name="qpid.message"> + <level value="INFO"/> + </logger> + + + <!-- Log all info events to file --> + <root> + <level value="debug"/> + <appender-ref ref="TestAppender"/> + </root> + +</log4j:configuration> diff --git a/qpid/java/test-profiles/log4j-test.xml b/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml index a393fa0952..eb75e740b9 100644 --- a/qpid/java/test-profiles/log4j-test.xml +++ b/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml @@ -32,7 +32,7 @@ <param name="ImmediateFlush" value="true"/> <param name="Follow" value="true"/> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/> + <param name="ConversionPattern" value="%d %-5p [%t] (%c{2}) - %m%n"/> </layout> </appender> @@ -48,18 +48,10 @@ <level value="${amqj.protocol.logging.level}"/> </logger> - <logger name="org.apache.qpid.test.utils.QpidTestCase"> - <level value="ALL"/> - </logger> - <logger name="org.apache.commons"> <level value="WARN"/> </logger> - <logger name="apache.commons.configuration.ConfigurationFactory"> - <level value="ERROR"/> - </logger> - <root> <level value="${root.logging.level}"/> <appender-ref ref="console" /> |