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

Improve rake test

Check for `system` call return value instead of `$?.exitstatus`

3 files changed, 4 insertions, 8 deletions

diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake
index 9516210e205..5b937ce0a28 100644
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
@@ -8,9 +8,7 @@ namespace :gitlab do
     ]
 
     cmds.each do |cmd|
-      result = system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
-
-      raise "#{cmd} failed!" unless result
+      system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
     end
   end
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
index 49fbe1bd47a..bee22300298 100644
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
@@ -40,7 +40,6 @@ end
 
 def run_commands(cmds)
   cmds.each do |cmd|
-    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
-    raise "#{cmd} failed!" unless $?.exitstatus.zero?
+    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
   end
 end
diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
index c23d0e0e188..dcc7d0fe01c 100644
--- a/lib/tasks/spinach.rake
+++ b/lib/tasks/spinach.rake
@@ -8,7 +8,6 @@ task :spinach do
   ]
 
   cmds.each do |cmd|
-    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
-    raise "#{cmd} failed!" unless $?.exitstatus.zero?
+    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
   end
 end