Merge pull request #1861 from marco-c/use_saner_timeout_values

Use saner timeout values

tests/automation.js

@@ -12,13 +12,11 @@ var uri = Services.io.newURI("http://localhost:8000", null, null);
 var principal = Services.scriptSecurityManager.getNoAppCodebasePrincipal(uri);
 Services.perms.addFromPrincipal(principal, "tcp-socket", Services.perms.ALLOW_ACTION);
 
-Services.prefs.setIntPref("dom.max_script_run_time", 70000);
-
 casper.on('remote.message', function(message) {
     this.echo(message);
 });
 
-casper.options.waitTimeout = 600000;
+casper.options.waitTimeout = 90000;
 casper.options.verbose = true;
 casper.options.viewportSize = { width: 240, height: 320 };
 casper.options.clientScripts = [