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

[Luke Kanies]

The following commit has been merged in the master branch:
commit f62d04d511a811a098854342d8be189f466f5a68
Author: Luke Kanies <luke at madstop.com>
Date:   Mon Nov 17 16:49:40 2008 -0600

    Fixing broken tests resulting from the fix to #1747
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/spec/unit/provider/confine/exists.rb b/spec/unit/provider/confine/exists.rb
index 1ab1d39..a3539c4 100755
--- a/spec/unit/provider/confine/exists.rb
+++ b/spec/unit/provider/confine/exists.rb
@@ -7,6 +7,7 @@ require 'puppet/provider/confine/exists'
 describe Puppet::Provider::Confine::Exists do
     before do
         @confine = Puppet::Provider::Confine::Exists.new("/my/file")
+        @confine.label = "eh"
     end
 
     it "should be named :exists" do
diff --git a/spec/unit/provider/confine/false.rb b/spec/unit/provider/confine/false.rb
index c6c43e3..6ff5cc1 100755
--- a/spec/unit/provider/confine/false.rb
+++ b/spec/unit/provider/confine/false.rb
@@ -18,6 +18,7 @@ describe Puppet::Provider::Confine::False do
 
         it "should use the 'pass?' method to test validity" do
             @confine = Puppet::Provider::Confine::False.new("foo")
+            @confine.label = "eh"
             @confine.expects(:pass?).with("foo")
             @confine.valid?
         end
diff --git a/spec/unit/provider/confine/feature.rb b/spec/unit/provider/confine/feature.rb
index 1845c9a..67e5936 100755
--- a/spec/unit/provider/confine/feature.rb
+++ b/spec/unit/provider/confine/feature.rb
@@ -22,6 +22,7 @@ describe Puppet::Provider::Confine::Feature do
             @features = mock 'features'
             Puppet.stubs(:features).returns @features
             @confine = Puppet::Provider::Confine::Feature.new("myfeature")
+            @confine.label = "eh"
         end
 
         it "should use the Puppet features instance to test validity" do
diff --git a/spec/unit/provider/confine/true.rb b/spec/unit/provider/confine/true.rb
index c9cc83c..75b36ce 100755
--- a/spec/unit/provider/confine/true.rb
+++ b/spec/unit/provider/confine/true.rb
@@ -14,7 +14,10 @@ describe Puppet::Provider::Confine::True do
     end
 
     describe "when testing values" do
-        before { @confine = Puppet::Provider::Confine::True.new("foo") }
+        before do
+            @confine = Puppet::Provider::Confine::True.new("foo")
+            @confine.label = "eh"
+        end
 
         it "should use the 'pass?' method to test validity" do
             @confine.expects(:pass?).with("foo")
diff --git a/spec/unit/provider/confine/variable.rb b/spec/unit/provider/confine/variable.rb
index 5f4c6c7..7a71fc1 100755
--- a/spec/unit/provider/confine/variable.rb
+++ b/spec/unit/provider/confine/variable.rb
@@ -65,6 +65,7 @@ describe Puppet::Provider::Confine::Variable do
 
         it "should produce a message that the fact value is not correct" do
             @confine = Puppet::Provider::Confine::Variable.new(%w{bar bee})
+            @confine.name = "eh"
             message = @confine.message("value")
             message.should be_include("facter")
             message.should be_include("bar,bee")

-- 
Puppet packaging for Debian