diff options
author | Luke Kanies <luke@madstop.com> | 2008-02-23 19:09:29 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-02-23 19:09:29 -0500 |
commit | 0323986acd3a288e77c54b5fde20b280fa92b90a (patch) | |
tree | 9b12a0bc61c2918beeafbd9fbe685304236c9d62 /test | |
parent | ff9705914570158d1bad3073728a2e94ca4a0060 (diff) | |
parent | 939c952465815486da0d6c1a2207debb61a45618 (diff) | |
download | puppet-0323986acd3a288e77c54b5fde20b280fa92b90a.tar.gz puppet-0323986acd3a288e77c54b5fde20b280fa92b90a.tar.xz puppet-0323986acd3a288e77c54b5fde20b280fa92b90a.zip |
Merge commit 'turnbull/0.24.x' into 0.24.x
Diffstat (limited to 'test')
-rwxr-xr-x | test/network/client/master.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/test/network/client/master.rb b/test/network/client/master.rb index 696d08bfd..67c47fa6d 100755 --- a/test/network/client/master.rb +++ b/test/network/client/master.rb @@ -211,6 +211,24 @@ end "Lost value to hostname") end + # Make sure that setting environment by fact takes precedence to configuration + def test_setenvironmentwithfact + 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 + + assert_equal(value, Puppet::Network::Client.master.facts[name]) + end + # Make sure we load all facts on startup. def test_loadfacts dirs = [tempfile(), tempfile()] |