From a5273319e880200c1e3b26e140a9cf8423daf3ce Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Wed, 8 Jul 2009 14:22:11 +0000 Subject: moved test profiles and related resources into test-profiles subdirectory git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@792157 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 qpid/java/test-profiles/java.testprofile (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile new file mode 100644 index 0000000000..d1e4c12bc1 --- /dev/null +++ b/qpid/java/test-profiles/java.testprofile @@ -0,0 +1,6 @@ +broker.language=java +broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB +broker.ready=Qpid Broker Ready + +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm ${test.profiles}/08ExcludeList-nopersistence -- cgit v1.2.1 From d7a34316af75bb1757d56d48cc0972674479c4cb Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Mon, 27 Jul 2009 18:32:33 +0000 Subject: rationalized naming of exclude files to make it clear why tests are excluded and where new exclusions should go; this also corrects the exclusion lists for some of the less common profiles since they now always include the 010Excludes which previously had to be manually copied to the other 010 profiles git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@798246 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index d1e4c12bc1..f920124735 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -3,4 +3,4 @@ broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=Qpid Broker Ready -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm ${test.profiles}/08ExcludeList-nopersistence +profile.excludes=08TransientExcludes 08StandaloneExcludes -- cgit v1.2.1 From bb7a36a8b06a50d85cc6161098f69e1fe4269e92 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 7 Aug 2009 18:07:47 +0000 Subject: QPID-2033 : Added destroy for broker process that fails to startup. Also augmented QpidTestCase and build profiles to take a new broker.stopped search value. If this appears in the log output during the external broker startup and the broker does not report ready then the startup will report the line of text associated with the exception as part of the failure. Currently the stopped value is set to to 'Exception'. This means if an exception occurs during startup then test will give more detail about the cause of the failure. This is only monitored during the brokerStart() call and through the getStopLine() call on the Piper we can return the line of text that the Exception matched. Providing more details of why a broker failed to startup. This extra detail is currently added to the exception thrown when the broker fails to become ready. Added test.mport to profile for defaulting management port git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@802118 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index f920124735..52f1013cf1 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -1,6 +1,7 @@ broker.language=java broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB -broker.ready=Qpid Broker Ready +broker.ready=Ready +broker.stopped=Exception profile.excludes=08TransientExcludes 08StandaloneExcludes -- cgit v1.2.1 From 79faafad69cb033712dfc0cf84cf0a8a2431eeda Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 12 Aug 2009 18:24:45 +0000 Subject: QPID-2002 : Update the signal for when the broker is ready to be the new BRK-1004 log message for the java profiles. qpid.ready=BRK-1004 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@803653 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index 52f1013cf1..05a801ee06 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -1,7 +1,7 @@ broker.language=java broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB -broker.ready=Ready +broker.ready=BRK-1004 broker.stopped=Exception profile.excludes=08TransientExcludes 08StandaloneExcludes -- cgit v1.2.1 From afcf8099695253651c73910a243fb29aa520b008 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 25 Oct 2009 22:58:57 +0000 Subject: Merged from java-broker-0-10 branch git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@829675 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index 05a801ee06..8dd835a335 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -1,7 +1,7 @@ broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=BRK-1004 broker.stopped=Exception - +qpid.amqp.version=0-9 profile.excludes=08TransientExcludes 08StandaloneExcludes -- cgit v1.2.1 From d1a7832af610f2973f692d3c410d82d97fc1b83a Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Tue, 8 Dec 2009 11:42:59 +0000 Subject: Updated exclude files to aline with the broker they work with. The CPPExcludes file needs to be split in to a 010Excludes file so that the CPPExclude only contains test the CPP broker should not run and the 010Exclude contains tests that any 0-10 broker should exclude. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@888347 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index 8dd835a335..a301fb1b65 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -4,4 +4,4 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception qpid.amqp.version=0-9 -profile.excludes=08TransientExcludes 08StandaloneExcludes +profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes -- cgit v1.2.1 From 4b6d7560ebce653e6a65ff2296acff3bad4846cf Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 20 Jan 2010 19:21:16 +0000 Subject: QPID-2349 : Fixed Protocol Version negotiation. The Negotiated protocol version was not given to the ProtocolSession. Once this is done the correct delegate is enabled on connection. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@901341 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index a301fb1b65..ce73d5b5de 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -3,5 +3,8 @@ broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=BRK-1004 broker.stopped=Exception -qpid.amqp.version=0-9 +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes -- cgit v1.2.1 From 77ce8ac58d6e86d958f84de51cbc2f5d6636a5e7 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Thu, 22 Jul 2010 16:14:20 +0000 Subject: QPID-2658: Adding 0-10 profile excludes for java git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@966724 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index ce73d5b5de..c7d6725d68 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -1,6 +1,6 @@ broker.language=java broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception # -- cgit v1.2.1 From e0e0eda8308719a3da0a6f886395641b542eac54 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 31 Oct 2010 23:40:12 +0000 Subject: add ASF licence to Java .testprofile and exclude files git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1029522 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/java.testprofile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'qpid/java/test-profiles/java.testprofile') diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile index c7d6725d68..c8c776d3e1 100644 --- a/qpid/java/test-profiles/java.testprofile +++ b/qpid/java/test-profiles/java.testprofile @@ -1,3 +1,21 @@ +# +# 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. +# broker.language=java broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work -- cgit v1.2.1