Fixing 2855 Inadvertent zlib dependency

Disables the b64_zlib_yaml format if zlib cannot be loaded.

I've added a --no-zlib to make it possible to test this on a single
machine, but it might also be useful if someone finds themselves failing
to connect to a server that doesn't have zlib installed.

FactHandler' format is still hard-coded to YAML rather than using
facts.class.default_format

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/spec/unit/network/formats.rb b/spec/unit/network/formats.rb
index b1ef9ec53..a241306a2 100755
--- a/spec/unit/network/formats.rb
+++ b/spec/unit/network/formats.rb
@@ -91,6 +91,9 @@ describe "Puppet Network Format" do
     end
 
     describe "base64 compressed yaml" do
+        yaml = Puppet::Network::FormatHandler.format(:b64_zlib_yaml)
+        confine "We must have zlib" => Puppet.features.zlib?
+
         before do
             @yaml = Puppet::Network::FormatHandler.format(:b64_zlib_yaml)
         end
@@ -173,6 +176,34 @@ describe "Puppet Network Format" do
         it "should fixup incorrect yaml to correct" do
             @yaml.fixup("&id004 !ruby/object:Puppet::Relationship ?").should == "? &id004 !ruby/object:Puppet::Relationship"
         end
+
+        describe "when zlib is disabled" do
+            before do
+                Puppet[:zlib] = false
+            end
+
+            it "use_zlib? should return false" do
+                @yaml.use_zlib?.should == false  
+            end
+
+            it "should refuse to encode" do
+                lambda{ @yaml.encode("foo") }.should raise_error
+            end
+
+            it "should refuse to decode" do
+                lambda{ @yaml.decode("foo") }.should raise_error
+            end
+        end
+
+        describe "when zlib is not installed" do
+            it "use_zlib? should return false" do
+                Puppet[:zlib] = true
+                Puppet.features.expects(:zlib?).returns(false)
+
+                @yaml.use_zlib?.should == false
+            end
+        end
+
     end
 
     it "should include a marshal format" do