Skip to content
This repository has been archived by the owner on May 2, 2020. It is now read-only.

Commit

Permalink
spec: bump karma browser timeout, add realtime output in js:test
Browse files Browse the repository at this point in the history
refs SD-1060

if a jenkins node is overloaded or has too few cores, tests can abort
before starting. sometimes it takes more than 10 seconds for requirejs
to load :allthethings: 😭

Change-Id: I72f3c39abb65a06524bbb981a8fdd8a7cbbac568
Reviewed-on: https://gerrit.instructure.com/81659
Reviewed-by: Clay Diffrient <[email protected]>
Tested-by: Jenkins
Product-Review: Jon Jensen <[email protected]>
QA-Review: Jon Jensen <[email protected]>
  • Loading branch information
jenseng committed Jun 6, 2016
1 parent 580e16f commit c0cc7bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 2 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ var karmaConfig = {
// If browser does not capture in given timeout [ms], kill it
captureTimeout: 60000,

browserNoActivityTimeout: 20000,

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: false
Expand Down
13 changes: 1 addition & 12 deletions lib/tasks/js.rake
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ namespace :js do
end
puts "--> executing browser tests with Karma"
build_runner
karma_output = `./node_modules/karma/bin/karma start --browsers Chrome --single-run --reporters progress,#{reporter} 2>&1`
puts karma_output
system "./node_modules/karma/bin/karma start --browsers Chrome --single-run --reporters progress,#{reporter}"

if $?.exitstatus != 0
puts 'some specs failed'
Expand Down Expand Up @@ -367,14 +366,4 @@ namespace :js do
EmberBundle.new(app).build
end
end

#def npm_run(command)
#puts "Running npm script `#{command}`"
#msg = `$(npm bin)/#{command} 2>&1`
#unless $?.success?
#raise msg
#end
#msg
#end

end

0 comments on commit c0cc7bc

Please sign in to comment.