diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-03-03 11:59:14 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-03-03 11:59:14 +1100 |
| commit | 281448fb47a7c88bf8d1c3222d03264ecfaeb183 (patch) | |
| tree | 1e8bb91ed20fd1385c63cff8d5aa77db7eb1f68d /test/network | |
| parent | f1d75c8bc2604ea396c6d88ba7eef866f48f6046 (diff) | |
| parent | ba803a1fb8190997f277b83d50c531b446b2a67f (diff) | |
| download | puppet-281448fb47a7c88bf8d1c3222d03264ecfaeb183.tar.gz puppet-281448fb47a7c88bf8d1c3222d03264ecfaeb183.tar.xz puppet-281448fb47a7c88bf8d1c3222d03264ecfaeb183.zip | |
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'test/network')
| -rwxr-xr-x | test/network/client/master.rb | 10 |
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 |