summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorPaul Berry <paul@puppetlabs.com>2010-11-23 13:27:24 -0800
committerPaul Berry <paul@puppetlabs.com>2010-11-23 13:27:24 -0800
commit78beb7062caa65cd230e92012a29812b4c4af5ed (patch)
tree0eebf30870803c447e2c23b00c07594a9b4fcd79 /spec
parente00c582c8977a02200b86f18ccc6debf30abdfed (diff)
parent99f4d2fe6c3e9d7483206c0788ba5b3fe9f48454 (diff)
downloadpuppet-78beb7062caa65cd230e92012a29812b4c4af5ed.tar.gz
puppet-78beb7062caa65cd230e92012a29812b4c4af5ed.tar.xz
puppet-78beb7062caa65cd230e92012a29812b4c4af5ed.zip
Merge branch 'maint/next/make_upstart_tests_more_robust' into next
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/provider/service/upstart.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/unit/provider/service/upstart.rb b/spec/unit/provider/service/upstart.rb
index 439fd2c79..9fde9e67f 100644
--- a/spec/unit/provider/service/upstart.rb
+++ b/spec/unit/provider/service/upstart.rb
@@ -24,8 +24,7 @@ describe provider_class do
resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart, :status => "/bin/foo")
provider = provider_class.new(resource)
- Process::Status.any_instance.stubs(:exitstatus).returns(0)
- provider.expects(:ucommand)
+ provider.expects(:ucommand).with { `true`; true }
provider.status.should == :running
end