Merge branch 'drewbailey-webmock'

sauce-archives · Jan 20, 2016 · 63d92df · 63d92df
2 parents d7ac800 + e338eec
commit 63d92df
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/tasks/parallel_testing.rb b/lib/tasks/parallel_testing.rb
@@ -76,7 +76,7 @@ def run_parallel_tests(t, args, command)
   skip_check = (skip_check_string == 'true')
 
   warn_of_skipped_parallel_processes if skip_check
-
+  WebMock.disable! if ENV['DISABLE_WEBMOCK'] == 'true'
   if((ParallelTests.number_of_running_processes == 0) || skip_check)
     username    = ENV["SAUCE_USERNAME"].to_s
     access_key  = ENV["SAUCE_ACCESS_KEY"].to_s