Fix / Mark volatile the transient failures on Solaris.

3 files changed, 3 insertions, 2 deletions

diff --git a/spec/functional/run_lock_spec.rb b/spec/functional/run_lock_spec.rb
index 3fe77ff7ff..9eec0dab04 100644
--- a/spec/functional/run_lock_spec.rb
+++ b/spec/functional/run_lock_spec.rb
@@ -276,6 +276,7 @@ E
       end
 
       wait_on_lock
+      sleep 0.5 # Possible race condition on Solaris which pid is observed as 0
       File.read(lockfile).should == p1.to_s
 
       Process.waitpid2(p1)
@@ -283,4 +284,3 @@ E
 
   end
 end
-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 88e38bdc4b..2de0cae0ed 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -98,6 +98,7 @@ RSpec.configure do |config|
 
   # Tests that randomly fail, but may have value.
   config.filter_run_excluding :volatile => true
+  config.filter_run_excluding :volatile_on_solaris => true if solaris?
 
   # Add jruby filters here
   config.filter_run_excluding :windows_only => true unless windows?
diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb
index 8b4ea6a077..f57fd6875a 100644
--- a/spec/unit/application/client_spec.rb
+++ b/spec/unit/application/client_spec.rb
@@ -137,7 +137,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
     end
   end
 
-  it "should exit gracefully when sent SIGTERM" do
+  it "should exit gracefully when sent SIGTERM", :volatile_on_solaris do
     pid = fork do
       @app.run_application
     end