Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9BD5311C28 for ; Tue, 6 May 2014 11:15:48 +0000 (UTC) Received: (qmail 95909 invoked by uid 500); 6 May 2014 11:15:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 95797 invoked by uid 500); 6 May 2014 11:15:42 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 95783 invoked by uid 99); 6 May 2014 11:15:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 May 2014 11:15:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4E5FF935187; Tue, 6 May 2014 11:15:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Tue, 06 May 2014 11:15:41 -0000 Message-Id: <72abca999640433c868376452239f436@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Fixing the test due to the latest Jetty adding some unexpected text in case of escaped eceptions Repository: cxf Updated Branches: refs/heads/master 17d844c86 -> 3da0b5c05 Fixing the test due to the latest Jetty adding some unexpected text in case of escaped eceptions Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/17c66755 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17c66755 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17c66755 Branch: refs/heads/master Commit: 17c66755fc2376920f9b20b8e28a8314ec0de0c0 Parents: 217cf55 Author: Sergey Beryozkin Authored: Tue May 6 12:15:00 2014 +0100 Committer: Sergey Beryozkin Committed: Tue May 6 12:15:00 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/17c66755/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java index 34aad22..42abdc9 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java @@ -782,7 +782,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase { @Test public void testPropogateException() throws Exception { getAndCompare("http://localhost:" + PORT + "/bookstore/propagate-exception", - "", "application/xml", 500); + "Error: 500", "application/xml", 500); } @Test