puppet 4.3.0 → 4.4.0

data/spec/unit/provider/user/directoryservice_spec.rb

@@ -1,7 +1,9 @@
 #! /usr/bin/env ruby -S rspec
 # encoding: ASCII-8BIT
 require 'spec_helper'
-require 'plist'
+
+module Puppet::Util::Plist
+end
 
 describe Puppet::Type.type(:user).provider(:directoryservice) do
   let(:username) { 'nonexistent_user' }
@@ -14,7 +16,6 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
   let(:provider) { resource.provider }
   let(:users_plist_dir) { '/var/db/dslocal/nodes/Default/users' }
-  let(:stringio_object) { StringIO.new('new_stringio_object') }
 
   # This is the output of doing `dscl -plist . read /Users/<username>` which
   # will return a hash of keys whose values are all arrays.
@@ -82,9 +83,9 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
   # The below is the result of converting sha512_embedded_bplist to XML and
   # parsing it with Plist.parse_xml. It is a Ruby Hash whose value is a
-  # StringIO object holding a Base64 encoded salted-SHA512 password hash.
+  # Base64 encoded salted-SHA512 password hash.
   let(:sha512_embedded_bplist_hash) do
-    { 'SALTED-SHA512' => StringIO.new(sha512_pw_string) }
+    { 'SALTED-SHA512' => sha512_pw_string }
   end
 
   # The value below is the result of converting sha512_pw_string to Hex.
@@ -106,8 +107,8 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   let(:pbkdf2_embedded_bplist_hash) do
     {
       'SALTED-SHA512-PBKDF2' => {
-        'entropy'    => StringIO.new(pbkdf2_pw_string),
-        'salt'       => StringIO.new(pbkdf2_salt_string),
+        'entropy'    => pbkdf2_pw_string,
+        'salt'       => pbkdf2_salt_string,
         'iterations' => pbkdf2_iterations_value
       }
     }
@@ -290,7 +291,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe 'self#get_all_users' do
+  describe 'self#get_all_users', :if => Puppet.features.cfpropertylist? do
     let(:empty_plist) do
       '<?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -332,7 +333,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
       provider.class.stubs(:get_all_users).returns(testuser_hash)
       provider.class.stubs(:get_attribute_from_dscl).with('Users', username, 'ShadowHashData').returns(sha512_shadowhashdata_hash)
       provider.class.stubs(:get_list_of_groups).returns(group_plist_hash_guid)
-      provider.class.stubs(:convert_binary_to_xml).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
+      provider.class.stubs(:convert_binary_to_hash).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
       provider.class.prefetch({})
     end
 
@@ -488,13 +489,13 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
     it 'should call the get_salted_sha512 method on 10.7 and return the correct hash' do
       provider.class.expects(:get_attribute_from_dscl).with('Users', username, 'ShadowHashData').returns(sha512_shadowhashdata_hash)
-      provider.class.expects(:convert_binary_to_xml).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
+      provider.class.expects(:convert_binary_to_hash).with(sha512_embedded_bplist).returns(sha512_embedded_bplist_hash)
       expect(provider.class.prefetch({}).first.password).to eq(sha512_password_hash)
     end
 
     it 'should call the get_salted_sha512_pbkdf2 method on 10.8 and return the correct hash' do
       provider.class.expects(:get_attribute_from_dscl).with('Users', username,'ShadowHashData').returns(pbkdf2_shadowhashdata_hash)
-      provider.class.expects(:convert_binary_to_xml).with(pbkdf2_embedded_plist).returns(pbkdf2_embedded_bplist_hash)
+      provider.class.expects(:convert_binary_to_hash).with(pbkdf2_embedded_plist).returns(pbkdf2_embedded_bplist_hash)
       expect(provider.class.prefetch({}).first.password).to eq(pbkdf2_password_hash)
     end
 
@@ -566,7 +567,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe '#get_list_of_groups' do
+  describe '#get_list_of_groups', :if => Puppet.features.cfpropertylist? do
     # The below value is the result of running `dscl -plist . readall /Groups`
     # on an OS X system.
     let(:groups_xml) do
@@ -633,7 +634,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe '#get_attribute_from_dscl' do
+  describe '#get_attribute_from_dscl', :if => Puppet.features.cfpropertylist? do
     # The below value is the result of executing
     # `dscl -plist . read /Users/<username/ GeneratedUID`
     # on an OS X system.
@@ -662,30 +663,17 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
   end
 
-  describe '#convert_xml_to_binary' do
-    # Because this method relies on a binary that only exists on OS X, a stub
-    # object is needed to expect the calls. This makes testing somewhat...uneventful
-    let(:stub_io_object) { stub('connection') }
-
+  describe '#convert_hash_to_binary' do
     it 'should use plutil to successfully convert an xml plist to a binary plist' do
-      IO.expects(:popen).with('plutil -convert binary1 -o - -', 'r+').yields stub_io_object
-      Plist::Emit.expects(:dump).with('ruby_hash').returns('xml_plist_data')
-      stub_io_object.expects(:write).with('xml_plist_data')
-      stub_io_object.expects(:close_write)
-      stub_io_object.expects(:read).returns('binary_plist_data')
-      expect(provider.class.convert_xml_to_binary('ruby_hash')).to eq('binary_plist_data')
+      Puppet::Util::Plist.expects(:dump_plist).with('ruby_hash', :binary).returns('binary_plist_data')
+      expect(provider.class.convert_hash_to_binary('ruby_hash')).to eq('binary_plist_data')
     end
   end
 
-  describe '#convert_binary_to_xml' do
-    let(:stub_io_object) { stub('connection') }
-
+  describe '#convert_binary_to_hash' do
     it 'should accept a binary plist and return a ruby hash containing the plist data' do
-      IO.expects(:popen).with('plutil -convert xml1 -o - -', 'r+').yields stub_io_object
-      stub_io_object.expects(:write).with('binary_plist_data')
-      stub_io_object.expects(:close_write)
-      stub_io_object.expects(:read).returns(user_plist_xml)
-      expect(provider.class.convert_binary_to_xml('binary_plist_data')).to eq(user_plist_hash)
+      Puppet::Util::Plist.expects(:parse_plist).with('binary_plist_data').returns(user_plist_hash)
+      expect(provider.class.convert_binary_to_hash('binary_plist_data')).to eq(user_plist_hash)
     end
   end
 
@@ -697,7 +685,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
 
   describe '#get_salted_sha512' do
-    it "should accept a hash whose 'SALTED-SHA512' key contains a StringIO object with a base64 encoded salted-SHA512 password hash and return the hex value of that password hash" do
+    it "should accept a hash whose 'SALTED-SHA512' key contains a base64 encoded salted-SHA512 password hash and return the hex value of that password hash" do
       expect(provider.class.get_salted_sha512(sha512_embedded_bplist_hash)).to eq(sha512_password_hash)
     end
   end
@@ -764,15 +752,15 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
     let(:sha512_shadowhashdata) do
       {
-        'SALTED-SHA512' => StringIO.new('blankvalue')
+        'SALTED-SHA512' => 'blankvalue'
       }
     end
 
     let(:pbkdf2_shadowhashdata) do
       {
         'SALTED-SHA512-PBKDF2' => {
-          'entropy'    => StringIO.new('blank_entropy'),
-          'salt'       => StringIO.new('blank_salt'),
+          'entropy'    => 'blank_entropy',
+          'salt'       => 'blank_salt',
           'iterations' => 100
         }
       }
@@ -797,7 +785,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
           ";Kerberosv5;;puppet@LKDC:S HA1.35580B1D6366D2890A35D430373FF653297F377D;LKDC:SHA1.35580B1D6366D2890A35D430373FF653297F377D"],
         "_writers_realname"        => ["puppet"],
         "_writers_hint"            => ["puppet"],
-        "ShadowHashData"           => [StringIO.new('blank')]
+        "ShadowHashData"           => ['blank']
       }
     end
 
@@ -827,34 +815,33 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
 
   describe '#set_salted_sha512' do
-    let(:users_plist) { {'ShadowHashData' => [StringIO.new('string_data')] } }
+    let(:users_plist) { {'ShadowHashData' => ['string_data'] } }
     let(:sha512_shadow_hash_data) do
       {
-        'SALTED-SHA512' => stringio_object
+        'SALTED-SHA512' => sha512_pw_string
       }
     end
 
     it 'should set the SALTED-SHA512 password hash for a user in 10.7 and call the set_shadow_hash_data method to write the plist to disk' do
-      provider.class.expects(:convert_xml_to_binary).with(sha512_embedded_bplist_hash).returns(sha512_embedded_bplist)
+      provider.class.expects(:convert_hash_to_binary).with(sha512_embedded_bplist_hash).returns(sha512_embedded_bplist)
       provider.expects(:set_shadow_hash_data).with(users_plist, sha512_embedded_bplist)
       provider.set_salted_sha512(users_plist, sha512_embedded_bplist_hash, sha512_password_hash)
     end
 
     it 'should set the salted-SHA512 password, even if a blank shadow_hash_data hash is passed' do
-      provider.expects(:new_stringio_object).returns(stringio_object)
-      provider.class.expects(:convert_xml_to_binary).with(sha512_shadow_hash_data).returns(sha512_embedded_bplist)
+      provider.class.expects(:convert_hash_to_binary).with(sha512_shadow_hash_data).returns(sha512_embedded_bplist)
       provider.expects(:set_shadow_hash_data).with(users_plist, sha512_embedded_bplist)
       provider.set_salted_sha512(users_plist, false, sha512_password_hash)
     end
   end
 
   describe '#set_salted_pbkdf2' do
-    let(:users_plist) { {'ShadowHashData' => [StringIO.new('string_data')] } }
+    let(:users_plist) { {'ShadowHashData' => ['string_data'] } }
     let(:entropy_shadow_hash_data) do
       {
         'SALTED-SHA512-PBKDF2' =>
         {
-          'entropy' => stringio_object
+          'entropy' => 'binary_string'
         }
       }
     end
@@ -862,29 +849,28 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     # This will also catch the edge-case where a 10.6-style user exists on
     # a 10.8 system and Puppet attempts to set a password
     it 'should not fail if shadow_hash_data is not a Hash' do
-      provider.expects(:new_stringio_object).returns(stringio_object)
       provider.expects(:base64_decode_string).with(pbkdf2_password_hash).returns('binary_string')
-      provider.class.expects(:convert_xml_to_binary).with(entropy_shadow_hash_data).returns('binary_plist')
+      provider.class.expects(:convert_hash_to_binary).with(entropy_shadow_hash_data).returns('binary_plist')
       provider.expects(:set_shadow_hash_data).with({'passwd' => '********'}, 'binary_plist')
       provider.set_salted_pbkdf2({}, false, 'entropy', pbkdf2_password_hash)
     end
 
     it "should set the PBKDF2 password hash when the 'entropy' field is passed with a valid password hash" do
-      provider.class.expects(:convert_xml_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
+      provider.class.expects(:convert_hash_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
       provider.expects(:set_shadow_hash_data).with(users_plist, pbkdf2_embedded_plist)
       users_plist.expects(:[]=).with('passwd', '********')
       provider.set_salted_pbkdf2(users_plist, pbkdf2_embedded_bplist_hash, 'entropy', pbkdf2_password_hash)
     end
 
     it "should set the PBKDF2 password hash when the 'salt' field is passed with a valid password hash" do
-      provider.class.expects(:convert_xml_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
+      provider.class.expects(:convert_hash_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
       provider.expects(:set_shadow_hash_data).with(users_plist, pbkdf2_embedded_plist)
       users_plist.expects(:[]=).with('passwd', '********')
       provider.set_salted_pbkdf2(users_plist, pbkdf2_embedded_bplist_hash, 'salt', pbkdf2_salt_value)
     end
 
     it "should set the PBKDF2 password hash when the 'iterations' field is passed with a valid password hash" do
-      provider.class.expects(:convert_xml_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
+      provider.class.expects(:convert_hash_to_binary).with(pbkdf2_embedded_bplist_hash).returns(pbkdf2_embedded_plist)
       provider.expects(:set_shadow_hash_data).with(users_plist, pbkdf2_embedded_plist)
       users_plist.expects(:[]=).with('passwd', '********')
       provider.set_salted_pbkdf2(users_plist, pbkdf2_embedded_bplist_hash, 'iterations', pbkdf2_iterations_value)
@@ -893,8 +879,7 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
 
   describe '#write_users_plist_to_disk' do
     it 'should save the passed plist to disk and convert it to a binary plist' do
-      Plist::Emit.expects(:save_plist).with(user_plist_xml, "#{users_plist_dir}/nonexistent_user.plist")
-      provider.expects(:plutil).with('-convert', 'binary1', "#{users_plist_dir}/nonexistent_user.plist")
+      Puppet::Util::Plist.expects(:write_plist_file).with(user_plist_xml, "#{users_plist_dir}/nonexistent_user.plist", :binary)
       provider.write_users_plist_to_disk(user_plist_xml)
     end
   end
@@ -907,10 +892,6 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
 
   describe '#get_users_plist' do
-    let(:test_plist) do
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>shell</key>\n\t<string>/bin/bash</string>\n\t<key>user</key>\n\t<string>puppet</string>\n</dict>\n</plist>\n"
-    end
-
     let(:test_hash) do
       {
         'user'  => 'puppet',
@@ -919,15 +900,15 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
     end
 
     it 'should convert a plist to a valid Ruby hash' do
-      provider.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', "#{users_plist_dir}/#{username}.plist").returns(test_plist)
-      expect(provider.get_users_plist(username)).to eq(test_hash)
+      Puppet::Util::Plist.expects(:read_plist_file).with("#{users_plist_dir}/#{username}.plist").returns(test_hash)
+      expect(provider.get_users_plist(username)).to eq(test_hash, )
     end
   end
 
   describe '#get_shadow_hash_data' do
     let(:shadow_hash) do
       {
-        'ShadowHashData' => [StringIO.new('test')]
+        'ShadowHashData' => ['test']
       }
     end
 
@@ -941,10 +922,10 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
       expect(provider.get_shadow_hash_data(no_shadow_hash)).to eq(false)
     end
 
-    it 'should call convert_binary_to_xml() with the contents of the StringIO Object ' +
+    it 'should call convert_binary_to_hash() with the string ' +
        'located in the first element of the array of the ShadowHashData key if the ' +
        'passed users_plist contains a ShadowHashData key' do
-      provider.class.expects(:convert_binary_to_xml).with('test').returns('returnvalue')
+      provider.class.expects(:convert_binary_to_hash).with('test').returns('returnvalue')
       expect(provider.get_shadow_hash_data(shadow_hash)).to eq('returnvalue')
     end
   end

data/spec/unit/provider/user/windows_adsi_spec.rb

@@ -64,9 +64,9 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
 
   describe "#groups_insync?" do
 
-    let(:group1) { stub(:account => 'group1', :domain => '.', :to_s => 'group1sid') }
-    let(:group2) { stub(:account => 'group2', :domain => '.', :to_s => 'group2sid') }
-    let(:group3) { stub(:account => 'group3', :domain => '.', :to_s => 'group3sid') }
+    let(:group1) { stub(:account => 'group1', :domain => '.', :sid => 'group1sid') }
+    let(:group2) { stub(:account => 'group2', :domain => '.', :sid => 'group2sid') }
+    let(:group3) { stub(:account => 'group3', :domain => '.', :sid => 'group3sid') }
 
     before :each do
       Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('group1').returns(group1)
@@ -244,8 +244,8 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
   end
 
   it 'should be able to test whether a user exists' do
-    Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
-    Puppet::Util::Windows::ADSI.stubs(:connect).returns stub('connection')
+    Puppet::Util::Windows::SID.stubs(:name_to_sid_object).returns(nil)
+    Puppet::Util::Windows::ADSI.stubs(:connect).returns stub('connection', :Class => 'User')
     expect(provider).to be_exists
 
     Puppet::Util::Windows::ADSI.stubs(:connect).returns nil

data/spec/unit/provider/yumrepo/inifile_spec.rb

@@ -249,6 +249,22 @@ describe Puppet::Type.type(:yumrepo).provider(:inifile) do
       expect(described_class.reposdir('/etc/yum.conf')).to include("/etc/yum/extra.repos.d")
     end
 
+    it "includes the directory if the value is split by whitespace" do
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(true)
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/misc.repos.d").returns(true)
+
+      described_class.expects(:find_conf_value).with('reposdir', '/etc/yum.conf').returns "/etc/yum/extra.repos.d /etc/yum/misc.repos.d"
+      expect(described_class.reposdir('/etc/yum.conf')).to include("/etc/yum/extra.repos.d", "/etc/yum/misc.repos.d")
+    end
+
+    it "includes the directory if the value is split by new lines" do
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(true)
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/misc.repos.d").returns(true)
+
+      described_class.expects(:find_conf_value).with('reposdir', '/etc/yum.conf').returns "/etc/yum/extra.repos.d\n/etc/yum/misc.repos.d"
+      expect(described_class.reposdir('/etc/yum.conf')).to include("/etc/yum/extra.repos.d", "/etc/yum/misc.repos.d")
+    end
+
     it "doesn't include the directory specified by the yum.conf 'reposdir' entry when the directory is absent" do
       Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(false)
 

data/spec/unit/resource/capability_finder_spec.rb

@@ -15,7 +15,7 @@ describe Puppet::Resource::CapabilityFinder do
     around(:each) do |example|
       mock_pdb = !Puppet::Util.const_defined?('Puppetdb')
       if mock_pdb
-        class Puppet::Util::Puppetdb
+        module Puppet::Util::Puppetdb
           class Http; end
         end
       end
@@ -27,11 +27,8 @@ describe Puppet::Resource::CapabilityFinder do
       end
     end
 
-    class MockResponse
-      def body
-        '[{"type": "Cap", "title": "cap", "parameters": { "host" : "ahost" }}]'
-      end
-    end
+    let(:response_body) { [{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"ahost"}}] }
+    let(:response) { stub('response', :body => response_body.to_json) }
 
     def make_cap_type
       Puppet::Type.newtype :cap, :is_capability => true do
@@ -40,17 +37,33 @@ describe Puppet::Resource::CapabilityFinder do
       end
     end
 
-    it 'should call Puppet::Util::PuppetDB::Http.action' do
-      Puppet::Util::Puppetdb::Http.expects(:action).returns(MockResponse.new)
-      result = Puppet::Resource::CapabilityFinder.find('production', nil, Puppet::Resource.new('Cap', 'cap'))
-      expect(result['host']).to eq('ahost')
+    describe "when query_puppetdb method is available" do
+      it 'should call use the query_puppetdb method if available' do
+        Puppet::Util::Puppetdb.expects(:query_puppetdb).returns(response_body)
+        Puppet::Util::Puppetdb::Http.expects(:action).never
+
+        result = Puppet::Resource::CapabilityFinder.find('production', nil, Puppet::Resource.new('Cap', 'cap'))
+        expect(result['host']).to eq('ahost')
+      end
     end
 
-    it 'should use pass code_id in query to Puppet::Util::PuppetDB::Http.action' do
-      code_id = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
-      Puppet::Util::Puppetdb::Http.expects(:action).with(regexp_matches(Regexp.new(CGI.escape('"=","code_id","' + code_id + "")))).returns(MockResponse.new)
-      result = Puppet::Resource::CapabilityFinder.find('production', code_id, Puppet::Resource.new('Cap', 'cap'))
-      expect(result['host']).to eq('ahost')
+    describe "when query_puppetdb method is unavailable" do
+      before :each do
+        Puppet::Util::Puppetdb.stubs(:respond_to?).with(:query_puppetdb).returns false
+      end
+
+      it 'should call Puppet::Util::PuppetDB::Http.action' do
+        Puppet::Util::Puppetdb::Http.expects(:action).returns(response)
+        result = Puppet::Resource::CapabilityFinder.find('production', nil, Puppet::Resource.new('Cap', 'cap'))
+        expect(result['host']).to eq('ahost')
+      end
+
+      it 'should include code_id in query' do
+        code_id = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
+        Puppet::Util::Puppetdb::Http.expects(:action).with(regexp_matches(Regexp.new(CGI.escape('"=","code_id","' + code_id + "")))).returns(response)
+        result = Puppet::Resource::CapabilityFinder.find('production', code_id, Puppet::Resource.new('Cap', 'cap'))
+        expect(result['host']).to eq('ahost')
+      end
     end
   end
 end

data/spec/unit/resource/catalog_spec.rb

@@ -91,6 +91,17 @@ describe Puppet::Resource::Catalog, "when compiling" do
     expect(catalog.code_id).to be_nil
   end
 
+  it "should include a catalog_uuid" do
+    SecureRandom.stubs(:uuid).returns ("827a74c8-cf98-44da-9ff7-18c5e4bee41e")
+    catalog = Puppet::Resource::Catalog.new("host")
+    expect(catalog.catalog_uuid).to eq("827a74c8-cf98-44da-9ff7-18c5e4bee41e")
+  end
+
+  it "should include the current catalog_format" do
+    catalog = Puppet::Resource::Catalog.new("host")
+    expect(catalog.catalog_format).to eq(1)
+  end
+
   describe "when compiling" do
     it "should accept tags" do
       config = Puppet::Resource::Catalog.new("mynode")
@@ -268,6 +279,16 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @original.code_id = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
       expect(@original.filter.code_id).to eq(@original.code_id)
     end
+
+    it 'copies the catalog_uuid' do
+      @original.catalog_uuid = '827a74c8-cf98-44da-9ff7-18c5e4bee41e'
+      expect(@original.filter.catalog_uuid).to eq(@original.catalog_uuid)
+    end
+
+    it 'copies the catalog_format' do
+      @original.catalog_format = 42
+      expect(@original.filter.catalog_format).to eq(@original.catalog_format)
+    end
   end
 
   describe "when functioning as a resource container" do
@@ -799,7 +820,9 @@ describe Puppet::Resource::Catalog, "when converting to pson" do
 
   { :name => 'myhost',
     :version => 42,
-    :code_id => 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
+    :code_id => 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe',
+    :catalog_uuid => '827a74c8-cf98-44da-9ff7-18c5e4bee41e',
+    :catalog_format => 42
   }.each do |param, value|
     it "emits a #{param} equal to #{value.inspect}" do
       @catalog.send(param.to_s + "=", value)
@@ -853,6 +876,8 @@ describe Puppet::Resource::Catalog, "when converting from pson" do
   it "should create it with the provided name" do
     @data['version'] = 50
     @data['code_id'] = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
+    @data['catalog_uuid'] = '827a74c8-cf98-44da-9ff7-18c5e4bee41e'
+    @data['catalog_format'] = 42
     @data['tags'] = %w{one two}
     @data['classes'] = %w{one two}
     @data['edges'] = [Puppet::Relationship.new("File[/foo]", "File[/bar]",
@@ -867,6 +892,8 @@ describe Puppet::Resource::Catalog, "when converting from pson" do
     expect(catalog.name).to eq('myhost')
     expect(catalog.version).to eq(@data['version'])
     expect(catalog.code_id).to eq(@data['code_id'])
+    expect(catalog.catalog_uuid).to eq(@data['catalog_uuid'])
+    expect(catalog.catalog_format).to eq(@data['catalog_format'])
     expect(catalog).to be_tagged("one")
     expect(catalog).to be_tagged("two")
 
@@ -878,6 +905,11 @@ describe Puppet::Resource::Catalog, "when converting from pson" do
     expect(catalog.edges[0].target).to eq(catalog.resource(:file, "/bar"))
   end
 
+  it "defaults the catalog_format to 0" do
+    catalog = Puppet::Resource::Catalog.from_data_hash PSON.parse @data.to_pson
+    expect(catalog.catalog_format).to eq(0)
+  end
+
   it "should fail if the source resource cannot be found" do
     @data['edges'] = [Puppet::Relationship.new("File[/missing]", "File[/bar]").to_data_hash]
     @data['resources'] = [Puppet::Resource.new(:file, "/bar").to_data_hash]