diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-21 11:57:35 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-21 11:57:35 -0700 |
| commit | 4a9cb92655dfcd307dabf07a90660f5e26f13e94 (patch) | |
| tree | bd1a37b0cf94adb0987a8b6331596f6c3cc1ff66 | |
| parent | 3db1cd0558f68a678399b3878715d7d346de06b5 (diff) | |
| parent | 09b9f9bd84e09f8ca9bb7d4e611082c047fac94d (diff) | |
| download | facter-4a9cb92655dfcd307dabf07a90660f5e26f13e94.tar.gz facter-4a9cb92655dfcd307dabf07a90660f5e26f13e94.tar.xz facter-4a9cb92655dfcd307dabf07a90660f5e26f13e94.zip | |
Merge branch 'tickets/next/6795-update-tests' into next
* tickets/next/6795-update-tests:
(#6795) Update tests to reflect changed exec
| -rwxr-xr-x | spec/unit/util/xendomains_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/util/xendomains_spec.rb b/spec/unit/util/xendomains_spec.rb index dc7e178..5562d26 100755 --- a/spec/unit/util/xendomains_spec.rb +++ b/spec/unit/util/xendomains_spec.rb @@ -9,13 +9,13 @@ describe Facter::Util::Xendomains do it "should return a list of running Xen Domains on Xen0" do sample_output_file = File.dirname(__FILE__) + '/../data/xendomains' xen0_domains = File.read(sample_output_file) - Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list').returns(xen0_domains) + Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains) Facter::Util::Xendomains.get_domains.should == %{web01,mailserver} end describe "when xm list isn't executable" do it "should be nil" do - Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list').returns(nil) + Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(nil) Facter::Util::Xendomains.get_domains.should == nil end end |