summaryrefslogtreecommitdiffstats
path: root/test/network
diff options
context:
space:
mode:
authorBlake Barnett <bdb@bdb-debvm1.stanford.edu>2008-02-28 22:54:12 -0800
committerBlake Barnett <bdb@bdb-debvm1.stanford.edu>2008-02-28 22:54:12 -0800
commit5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b (patch)
tree787bf2a1a6833a2d7e1f5ae9f9d4e4dfdeb91139 /test/network
parent0139889be92add151e624710261ef6f8c0048586 (diff)
parent65b72676aef2d58314f546eb31780d1b9925b9b3 (diff)
downloadpuppet-5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b.tar.gz
puppet-5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b.tar.xz
puppet-5d3dd9e718cbe69b2fe7f37bc3ec422c88a1080b.zip
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'test/network')
-rwxr-xr-xtest/network/client/master.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 67c47fa6d..41796575f 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -216,15 +216,7 @@ end
name = "environment"
value = "test_environment"
- Puppet[:filetimeout] = -1
- Puppet[:factsource] = tempfile()
- Dir.mkdir(Puppet[:factsource])
- file = File.join(Puppet[:factsource], "#{name}.rb")
- File.open(file, "w") do |f|
- f.puts %{Facter.add("#{name}") do setcode { "#{value}" } end }
- end
-
- Puppet::Network::Client.master.getfacts
+ Facter.stubs(:to_hash).returns(name => value)
assert_equal(value, Puppet::Network::Client.master.facts[name])
end