Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 51596 invoked from network); 25 Feb 2010 01:09:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Feb 2010 01:09:33 -0000 Received: (qmail 43967 invoked by uid 500); 25 Feb 2010 01:09:33 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 43879 invoked by uid 500); 25 Feb 2010 01:09:33 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 43871 invoked by uid 99); 25 Feb 2010 01:09:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 01:09:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 01:09:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E17222388901; Thu, 25 Feb 2010 01:09:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r916073 - /continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java Date: Thu, 25 Feb 2010 01:09:09 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100225010909.E17222388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Thu Feb 25 01:09:09 2010 New Revision: 916073 URL: http://svn.apache.org/viewvc?rev=916073&view=rev Log: set timeout in Selenium tests consistently Modified: continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java Modified: continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java?rev=916073&r1=916072&r2=916073&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java (original) +++ continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java Thu Feb 25 01:09:09 2010 @@ -19,6 +19,11 @@ * under the License. */ +import com.thoughtworks.selenium.DefaultSelenium; +import com.thoughtworks.selenium.Selenium; +import org.apache.commons.io.IOUtils; +import org.testng.Assert; + import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -26,14 +31,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; - -import org.apache.commons.io.IOUtils; -import org.testng.Assert; - -import com.thoughtworks.selenium.DefaultSelenium; -import com.thoughtworks.selenium.Selenium; +import java.util.Properties; /** * Based on AbstractSeleniumTestCase of Emmanuel Venisse test. @@ -78,6 +77,7 @@ { DefaultSelenium s = new DefaultSelenium( seleniumHost, seleniumPort, browser, baseUrl ); s.start(); + s.setTimeout( maxWaitTimeInMs ); selenium.set( s ); } }