diff options
author | Elan Ruusamäe <glen@delfi.ee> | 2013-11-18 23:57:15 +0200 |
---|---|---|
committer | Bryan McLellan <btm@opscode.com> | 2013-11-25 11:33:32 -0800 |
commit | abcaf72402b16af8894f915b1e0c30bd6c876b2f (patch) | |
tree | 362fa296040cb39d917c8b1e96e8b68df77bfa45 | |
parent | fe5489b10d0656d02abafff9c9de7242aa9109fe (diff) | |
download | ohai-abcaf72402b16af8894f915b1e0c30bd6c876b2f.tar.gz |
update test with current master
test passes:
$ ruby -S rspec spec/unit/plugins/php_spec.rb
Conflicts:
spec/unit/plugins/php_spec.rb
-rw-r--r-- | spec/unit/plugins/php_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/unit/plugins/php_spec.rb b/spec/unit/plugins/php_spec.rb index 78c3a977..0cf011e0 100644 --- a/spec/unit/plugins/php_spec.rb +++ b/spec/unit/plugins/php_spec.rb @@ -49,10 +49,8 @@ describe Ohai::System, "plugin php" do end it "should parse builddate even if it's suhosin patched" do - @status = 1 @stdout = "PHP 5.3.27 with Suhosin-Patch (cli) (built: Aug 30 2013 04:30:30) \nCopyright (c) 1997-2013 The PHP Group\nZend Engine v2.3.0, Copyright (c) 1998-2013 Zend Technologies" - @stderr = "" - @plugin.stub(:run_command).with({:no_status_check=>true, :command=>"php -v"}).and_return([@status, @stdout, @stderr]) + @plugin.stub(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, "")) @plugin.run @plugin.languages[:php][:builddate].should eql("Aug 30 2013 04:30:30") end |