diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-23 16:45:28 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-23 16:45:28 -0600 |
| commit | a525ab5f1d643dcd890a9f5fb34bbc5dab575393 (patch) | |
| tree | 8db93d005fea7b7541ba4f2dd6a8724e6241c2d7 | |
| parent | 6d74ddd40a33e54c8007e3a256270e76e56517a0 (diff) | |
| download | puppet-a525ab5f1d643dcd890a9f5fb34bbc5dab575393.tar.gz puppet-a525ab5f1d643dcd890a9f5fb34bbc5dab575393.tar.xz puppet-a525ab5f1d643dcd890a9f5fb34bbc5dab575393.zip | |
Fixing a couple of tests that were failing because of the environment changes.
| -rwxr-xr-x | test/language/functions.rb | 1 | ||||
| -rwxr-xr-x | test/network/client/master.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/language/functions.rb b/test/language/functions.rb index 2fc36f6cd..70dd6af7b 100755 --- a/test/language/functions.rb +++ b/test/language/functions.rb @@ -205,6 +205,7 @@ class TestLangFunctions < Test::Unit::TestCase file = tempfile() Puppet[:code] = %{file { "#{file}": content => template("#{template}") }} + Puppet[:environments] = "yay" interp = Puppet::Parser::Interpreter.new node = mknode node.stubs(:environment).returns("yay") diff --git a/test/network/client/master.rb b/test/network/client/master.rb index 7216af936..a005dadc7 100755 --- a/test/network/client/master.rb +++ b/test/network/client/master.rb @@ -545,6 +545,7 @@ end assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts") # Now set it to a real value + Puppet[:environments] = "something,else" Puppet[:environment] = "something" facts = Puppet::Network::Client::Master.facts assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts") |