Skip to content

Commit

Permalink
Disable Spring by default - #301
Browse files Browse the repository at this point in the history
  • Loading branch information
soberstadt committed Nov 30, 2015
1 parent 162b97c commit e06f7eb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions lib/parallel_tests/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class CLI
def run(argv)
options = parse_options!(argv)

ENV['DISABLE_SPRING']='1'

num_processes = ParallelTests.determine_number_of_processes(options[:count])
num_processes = num_processes * (options[:multiply] || 1)

Expand Down
5 changes: 5 additions & 0 deletions spec/parallel_tests/rspec/runner_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ def call(*args)
expect(ParallelTests::RSpec::Runner).to receive(:execute_command).and_return :x => 1
expect(call('xxx', 1, 22, {})).to eq({:x => 1})
end

it "has DISABLE_SPRING var set" do
call('xxx', 1, 22, {})
expect(ENV['DISABLE_SPRING']).to eq '1'
end
end

describe :find_results do
Expand Down

0 comments on commit e06f7eb

Please sign in to comment.