Skip to content
Browse files

attempt fix failing functional tests

  • Loading branch information...
1 parent da6d7ac commit 5dd411f4572984684dafb09832642c403876278d Graeme Rocher committed Apr 24, 2012
View
2 src/test/groovy/grails/functional/tests/BaseSpec.groovy
@@ -192,7 +192,7 @@ abstract class BaseSpec extends GebReportingSpec{
private Process createProcess(boolean debug,String project, CharSequence[] command) {
if (project != null && !(project in upgradedProjects)) { upgradeProject(project) }
- def completeCommand = ["${grailsHome}/bin/${debug ? 'grails-debug' : 'grails'}", "-Dgrails.work.dir=${grailsWorkDir}/${project} -Dgrails.project.work.dir=${projectWorkDir}/${project}", "--non-interactive", '--stacktrace']
+ def completeCommand = ["${grailsHome}/bin/${debug ? 'grails-debug' : 'grails'}", "-Dgrails.work.dir=${grailsWorkDir} -Dgrails.project.work.dir=${projectWorkDir}/${project}", "--non-interactive", '--stacktrace']
if(port != null) {
completeCommand << "-Dgrails.server.port.http=${port}"
}
View
6 src/test/groovy/grails/functional/tests/internal/GrailsExecutor.groovy
@@ -9,7 +9,7 @@ import org.junit.Assert
*/
class GrailsExecutor {
@Delegate BaseSpec parent
- def invokeMethod(String name, Object args) {
+ def invokeMethod(String name, Object args) {
"${parent.debug ? 'executeDebug' : 'execute'}"(
getProject(),
Utils.getCommandName(name),
@@ -58,8 +58,8 @@ class GrailsExecutor {
static int waitForPort(boolean isDebug, int port, Closure onFailure, Closure onSuccess) {
int timeout = 0
- // allow longer to attach a debugger
- def timeoutMax = isDebug ? 120000 : 60000
+
+ def timeoutMax = 1000 * 60 * 5 // 5 mins
while (true) {
if (timeout > timeoutMax) {
onFailure()

0 comments on commit 5dd411f

Please sign in to comment.
Something went wrong with that request. Please try again.