cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1501324 - in /cxf/branches/2.6.x-fixes: rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
Date Tue, 09 Jul 2013 15:16:36 GMT
Author: coheigea
Date: Tue Jul  9 15:16:35 2013
New Revision: 1501324

URL: http://svn.apache.org/r1501324
Log:
Merged revisions 1501315 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1501315 | coheigea | 2013-07-09 16:10:09 +0100 (Tue, 09 Jul 2013) | 10 lines

  Merged revisions 1501313 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1501313 | coheigea | 2013-07-09 16:06:05 +0100 (Tue, 09 Jul 2013) | 2 lines

    Relax some of the timeouts

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
    cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java

Modified: cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java?rev=1501324&r1=1501323&r2=1501324&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
Tue Jul  9 15:16:35 2013
@@ -91,7 +91,7 @@ public class JsHttpRequestTest extends A
         testUtilities.rhinoCallInContext("testStateNotificationSync");
         Notifier notifier = testUtilities.rhinoCallConvert("testAsyncHttpFetch1", Notifier.class);
         testUtilities.rhinoCallInContext("testAsyncHttpFetch2");
-        boolean notified = notifier.waitForJavascript(10000);
+        boolean notified = notifier.waitForJavascript(2 * 10000);
         assertTrue(notified);
         assertEquals("HEADERS_RECEIVED", Boolean.TRUE, 
                      testUtilities.rhinoEvaluateConvert("asyncGotHeadersReceived", Boolean.class));

Modified: cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=1501324&r1=1501323&r2=1501324&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
(original)
+++ cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
Tue Jul  9 15:16:35 2013
@@ -123,7 +123,7 @@ public class EngineLifecycleTest extends
                 break;
             } catch (Exception ex) {
                 response = null;
-                Thread.sleep(1000);
+                Thread.sleep(2 * 1000);
             }
         }
         assertNotNull("Test doc can not be read", response);
@@ -207,14 +207,14 @@ public class EngineLifecycleTest extends
         invokeService8801();
         shutdownService();
         System.gc(); //make sure the port is cleaned up a bit
-        Thread.sleep(100);
+        Thread.sleep(2 * 100);
         System.gc(); 
         verifyNoServer(PORT2);
         verifyNoServer(PORT1);
         
         
         setUpBus(true);
-        Thread.sleep(100);       
+        Thread.sleep(2 * 100);       
         invokeService();            
         invokeService8801();
         getTestHtml();



Mime
View raw message