svn commit: r1242623 - in /camel/branches/camel-2.9.x: ./ components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala

[hadrian]

Author: hadrian
Date: Fri Feb 10 00:39:31 2012
New Revision: 1242623

URL: http://svn.apache.org/viewvc?rev=1242623&view=rev
Log:
Merged revisions 1236325 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1236325 | hadrian | 2012-01-26 12:53:32 -0500 (Thu, 26 Jan 2012) | 1 line
  
  Fix for test with intermittent timing related failures
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala?rev=1242623&r1=1242622&r2=1242623&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
 Fri Feb 10 00:39:31 2012
@@ -28,7 +28,7 @@ class ThrottlerTest extends ScalaTestSup
   @Test
   def testSimpleThrottler = {
     "mock:a" expect { _.count = 3 } 
-    "mock:a" expect { _.setResultWaitTime(1000) }
+    "mock:a" expect { _.setResultWaitTime(1500) }
     for (id <- 1 to 6) "seda:a" ! id   
     "mock:a" assert()
   }
@@ -37,7 +37,7 @@ class ThrottlerTest extends ScalaTestSup
   def testBlockThrottler = {
     "mock:b" expect { _.count = 6 }
     "mock:c" expect { _.count = 3 } 
-    "mock:c" expect { _.setResultWaitTime(1000) }
+    "mock:c" expect { _.setResultWaitTime(1500) }
     for (id <- 1 to 6) "seda:b" ! id   
     "mock:b" assert()
   }