kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #34410 from gmcgibbon/test_support_windows 

Windows support for parallelization and instrumenter
This commit is contained in:
Eileen M. Uchitelle 2018-11-19 09:35:55 -08:00 committed by GitHub
parent 317bf45c24 0712dfd6ae
commit 9893998f4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activesupport/lib/active_support/notifications/instrumenter.rb
View File

@ -55,6 +55,11 @@ module ActiveSupport
attr_reader :name, :time, :transaction_id, :payload, :children attr_reader :name, :time, :transaction_id, :payload, :children
attr_accessor :end attr_accessor :end
def self.clock_gettime_supported? # :nodoc:
defined?(Process::CLOCK_PROCESS_CPUTIME_ID) &&
!Gem.win_platform?
end
def initialize(name, start, ending, transaction_id, payload) def initialize(name, start, ending, transaction_id, payload)
@name = name @name = name
@payload = payload.dup @payload = payload.dup
@ -130,7 +135,7 @@ module ActiveSupport
Process.clock_gettime(Process::CLOCK_MONOTONIC) Process.clock_gettime(Process::CLOCK_MONOTONIC)
end end
if defined?(Process::CLOCK_PROCESS_CPUTIME_ID) if clock_gettime_supported?
def now_cpu def now_cpu
Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID) Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID)
end end

2
activesupport/lib/active_support/testing/parallelization.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
require "drb" require "drb"
require "drb/unix" require "drb/unix" unless Gem.win_platform?
require "active_support/core_ext/module/attribute_accessors" require "active_support/core_ext/module/attribute_accessors"
module ActiveSupport module ActiveSupport

2
railties/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt
View File

@ -4,7 +4,7 @@ require 'rails/test_help'
class ActiveSupport::TestCase class ActiveSupport::TestCase
# Run tests in parallel with specified workers # Run tests in parallel with specified workers
<% if defined?(JRUBY_VERSION) -%> <% if defined?(JRUBY_VERSION) || Gem.win_platform? -%>
parallelize(workers: 2, with: :threads) parallelize(workers: 2, with: :threads)
<%- else -%> <%- else -%>
parallelize(workers: 2) parallelize(workers: 2)