Download as
Browse Code »

Commit 7c5d96cf5247e5f9a78c55d0ed8e8ccb92f016d2

Authored by Dmitriy Zaporozhets
2 parents aef2122f 1e7fa8d9
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'improve-gitlab-test' into 'master' 

Improve rake test

Check for `system` call return value instead of `$?.exitstatus`
Showing 3 changed files with 4 additions and 8 deletions   Show diff stats
lib/tasks/gitlab/test.rake
  Diff comments   View file @7c5d96c
... ... @@ -8,9 +8,7 @@ namespace :gitlab do
8 8 ]
9 9  
10 10 cmds.each do |cmd|
11   - result = system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
12   -
13   - raise "#{cmd} failed!" unless result
  11 + system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
14 12 end
15 13 end
16 14 -end
  15 +end
17 16 \ No newline at end of file
... ...
lib/tasks/spec.rake
  Diff comments   View file @7c5d96c
... ... @@ -40,7 +40,6 @@ end
40 40  
41 41 def run_commands(cmds)
42 42 cmds.each do |cmd|
43   - system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
44   - raise "#{cmd} failed!" unless $?.exitstatus.zero?
  43 + system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
45 44 end
46 45 end
... ...
lib/tasks/spinach.rake
  Diff comments   View file @7c5d96c
... ... @@ -8,7 +8,6 @@ task :spinach do
8 8 ]
9 9  
10 10 cmds.each do |cmd|
11   - system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
12   - raise "#{cmd} failed!" unless $?.exitstatus.zero?
  11 + system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
13 12 end
14 13 end
... ...