Comparing version 0.0.18 to 0.0.20
@@ -63,3 +63,3 @@ /* | ||
}); | ||
hub.emit('action:prune', action, req, cache); | ||
hub.emit('action:prune', action, req, res, cache); | ||
}); | ||
@@ -66,0 +66,0 @@ } |
@@ -49,7 +49,7 @@ /* | ||
function prune(doing_what, req, cache) { | ||
function prune(doing_what, req, res, cache) { | ||
var redirect; | ||
if (doing_what != 'status') { | ||
prune_browsers(req, cache); | ||
redirect = prune_tests(doing_what, req, cache); | ||
redirect = prune_tests(doing_what, req, res, cache); | ||
hub.emit('pruneDone', redirect); | ||
@@ -59,3 +59,3 @@ } | ||
function prune_tests(doing_what, req, cache) { | ||
function prune_tests(doing_what, req, res, cache) { | ||
var now = new Date().getTime(), | ||
@@ -74,3 +74,3 @@ browser = req.session.uuid, test, | ||
if (test.sendOutput) { | ||
hub.emit('sendOutput', test.sendOutput, test.url + ' timed out - javascript error?'); | ||
res.write(test.url + ' timed out - javascript error?'); | ||
} | ||
@@ -77,0 +77,0 @@ |
@@ -97,3 +97,5 @@ /* | ||
var pushed = false, v8Tests = ''; | ||
var pushed = false, v8Tests = '', | ||
seleniumUUID = uuid(); | ||
for (var i = 0; i < tests.length; i++) { | ||
@@ -128,3 +130,3 @@ var test = tests[i], | ||
// this is how we keep track | ||
obj.uuid = test_obj.browser = uuid(); | ||
obj.uuid = test_obj.browser = seleniumUUID; | ||
@@ -131,0 +133,0 @@ common.addTestOutput(test_obj, 'Selenium test'); |
@@ -59,2 +59,8 @@ /* | ||
// Give Selenium 1000 minutes to finish - should be good - 16 hours baby! | ||
req.socket.setTimeout(60000000, function() { | ||
hub.emit(hub.LOG, hub.ERROR, 'Selenium taking too long - giving up'); | ||
cb(); | ||
}); | ||
// called when all Selenium tests are complete for this browser | ||
@@ -61,0 +67,0 @@ cb = function() { |
@@ -5,3 +5,3 @@ { | ||
"keywords": ["selenium", "test", "testing", "unit", "tests"], | ||
"version": "0.0.18", | ||
"version": "0.0.20", | ||
"author": "Mark Ethan Trostler <mark@zzo.com>", | ||
@@ -8,0 +8,0 @@ "preferGlobal": true, |
@@ -143,7 +143,9 @@ #!/usr/bin/env node | ||
options.path = '/jute/_run_test'; | ||
options.method = 'POST'; | ||
options.path = '/jute/_run_test'; | ||
options.method = 'POST'; | ||
options.headers = { 'Content-Type': 'application/json' }; | ||
// See what we got | ||
console.log('Submitting ' + sys.inspect(juteArgs) + ' to ' + args.host); | ||
// POST AWAY! | ||
@@ -159,3 +161,6 @@ var req = http.request(options, function(res) { | ||
}); | ||
// 6000 seconds = 100 minutes | ||
req.socket.setTimeout(600000, function(e) { console.log('socket timeout!'); ); | ||
// Not Good | ||
@@ -167,5 +172,5 @@ req.on('error', function(e) { | ||
}); | ||
req.end(qs.stringify(juteArgs)); | ||
req.end(JSON.stringify(juteArgs)); | ||
if (!args.sel_host && args.wait) { | ||
@@ -172,0 +177,0 @@ options.path = '/jute/_status'; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2082581
3272