Author: dkulp
Date: Mon Sep 21 15:57:42 2009
New Revision: 817302
URL: http://svn.apache.org/viewvc?rev=817302&view=rev
Log:
Merged revisions 817294 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r817294 | dkulp | 2009-09-21 11:40:30 -0400 (Mon, 21 Sep 2009) | 4 lines
On some versions of windows (old XP's for instance),
the testPublishOnBusyPort fails as the OS just kind of silently
allows the publish to succeed. We'll just log a
warning to not cause build failures.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java?rev=817302&r1=817301&r2=817302&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
Mon Sep 21 15:57:42 2009
@@ -139,18 +139,30 @@
@Test
public void testPublishOnBusyPort() {
+ boolean isWindows =
System.getProperty("os.name").startsWith("Windows");
+
GreeterSessionImpl implementor = new GreeterSessionImpl();
String address = "http://localhost:9020/SoapContext/GreeterPort";;
try {
Endpoint.publish(address, implementor);
- fail("Should have failed to publish as the port is busy");
+ if (!isWindows) {
+ fail("Should have failed to publish as the port is busy");
+ } else {
+ System.err.println("Should have failed to publish as the port
is busy, but certains "
+ + "of Windows allow this.");
+ }
} catch (WebServiceException ex) {
//ignore
}
try {
//CXF-1589
Endpoint.publish(address, implementor);
- fail("Should have failed to publish as the port is busy");
+ if (!isWindows) {
+ fail("Should have failed to publish as the port is busy");
+ } else {
+ System.err.println("Should have failed to publish as the port
is busy, but certains "
+ + "of Windows allow this.");
+ }
} catch (WebServiceException ex) {
//ignore
}
