[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 06edac4a23b7d0c27e471c837fa34432dbc5f806
Author: James Turnbull <james at lovedthanlost.net>
Date:   Sun Oct 5 22:50:18 2008 +1100

    Fixed additional environments tests

diff --git a/spec/unit/node.rb b/spec/unit/node.rb
index cd22149..a72c117 100755
--- a/spec/unit/node.rb
+++ b/spec/unit/node.rb
@@ -45,7 +45,7 @@ describe Puppet::Node, "when initializing" do
     end
 
     it "should accept an environment value" do
-        Puppet.settings.stubs(:value).with(:environments).returns("myenv")
+        Puppet.settings.stubs(:value).with(:environment).returns("myenv")
         @node = Puppet::Node.new("testing", :environment => "myenv")
         @node.environment.should == "myenv"
     end
@@ -53,7 +53,7 @@ end
 
 describe Puppet::Node, "when returning the environment" do
     before do
-        Puppet.settings.stubs(:value).with(:environments).returns("one,two")
+        Puppet.settings.stubs(:value).with(:environment).returns("one,two")
         Puppet.settings.stubs(:value).with(:environment).returns("one")
         @node = Puppet::Node.new("testnode")
     end
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 0c14052..4a749ac 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -419,8 +419,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"
+	Puppet[:environment] = "something"
         facts = Puppet::Network::Client::Master.facts
         assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts")
     end

-- 
Puppet packaging for Debian