Author: eglynn
Date: Sun Dec 6 11:59:48 2009
New Revision: 887673
URL: http://svn.apache.org/viewvc?rev=887673&view=rev
Log:
Merged revisions 887669 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r887669 | eglynn | 2009-12-06 11:27:53 +0000 (Sun, 06 Dec 2009) | 2 lines
Unskipping a couple of tests that I'd inadvertantly left commented out
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 11:59:48 2009
@@ -1 +1 @@
-/cxf/trunk:887328,887353
+/cxf/trunk:887328,887353,887669
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java?rev=887673&r1=887672&r2=887673&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
Sun Dec 6 11:59:48 2009
@@ -104,7 +104,7 @@
}
- //@Test
+ @Test
public void testOverriddenSequentialStrategy() throws Exception {
startTarget(REPLICA_C);
setupGreeterA();
@@ -117,7 +117,7 @@
stopTarget(REPLICA_C);
}
- //@Test
+ @Test
public void testOverriddenRandomStrategy() throws Exception {
startTarget(REPLICA_B);
setupGreeterC();
