puppet 4.8.2-universal-darwin → 4.9.0-universal-darwin

data/spec/unit/provider/package/pkgng_spec.rb

@@ -65,6 +65,11 @@ describe provider_class do
       expect(nmap.properties[:version]).to eq(nmap.properties[:latest])
     end
 
+    it "should return an empty array when pkg calls raise an exception" do
+      provider_class.stubs(:get_query).raises(Puppet::ExecutionFailure, 'An error occurred.')
+      expect(provider_class.instances).to eq([])
+    end
+
     describe "version" do
       it "should retrieve the correct version of the current package" do
         zsh = provider_class.instances.find {|i| i.properties[:origin] == 'shells/zsh' }
@@ -111,6 +116,13 @@ describe provider_class do
     end
   end
 
+  context "#prefetch" do
+    it "should fail gracefully when " do
+      provider_class.stubs(:instances).returns([])
+      expect{ provider_class.prefetch({}) }.to_not raise_error
+    end
+  end
+
   context "#query" do
     it "should return the installed version if present" do
       provider_class.prefetch({installed_name => installed_resource})

data/spec/unit/provider/package/rpm_spec.rb

@@ -203,7 +203,7 @@ describe provider_class do
   describe "#latest" do
     it "retrieves version string after querying rpm for version from source file" do
       resource.expects(:[]).with(:source).returns('source-string')
-      Puppet::Util::Execution.expects(:execfail).with(["/bin/rpm", "-q", "--qf", nevra_format, "-p", "source-string"], Puppet::Error).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
+      Puppet::Util::Execution.expects(:execfail).with(["/bin/rpm", "-q", "--qf", "'#{nevra_format}'", "-p", "source-string"], Puppet::Error).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
       expect(provider.latest).to eq("1.2.3.4-5.el4")
     end
   end
@@ -218,7 +218,7 @@ describe provider_class do
 
     describe "on a modern RPM" do
       before(:each) do
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", "myresource", '--nosignature', '--nodigest', "--qf", nevra_format], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", "myresource", '--nosignature', '--nodigest', "--qf", "'#{nevra_format}'"], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
       end
 
       let(:rpm_version) { "RPM version 4.10.0\n" }
@@ -231,7 +231,7 @@ describe provider_class do
 
     describe "on an ancient RPM" do
       before(:each) do
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", "myresource", '', '', '--qf', nevra_format], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", "myresource", '', '', '--qf', "'#{nevra_format}'"], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
       end
 
       let(:rpm_version) { "RPM version 3.0.6\n" }
@@ -244,7 +244,7 @@ describe provider_class do
 
     describe "when uninstalled with options" do
       before(:each) do
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", "myresource", '--nosignature', '--nodigest', "--qf", nevra_format], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", "myresource", '--nosignature', '--nodigest', "--qf", "'#{nevra_format}'"], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
       end
 
       let(:resource) do
@@ -266,7 +266,7 @@ describe provider_class do
   describe "parsing" do
     def parser_test(rpm_output_string, gold_hash, number_of_debug_logs = 0)
       Puppet.expects(:debug).times(number_of_debug_logs)
-      Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", nevra_format], execute_options).returns(rpm_output_string)
+      Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "'#{nevra_format}'"], execute_options).returns(rpm_output_string)
       expect(provider.query).to eq(gold_hash)
     end
 
@@ -306,7 +306,7 @@ describe provider_class do
     describe "when the package is not found" do
       before do
         Puppet.expects(:debug).never
-        expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", nevra_format]
+        expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "'#{nevra_format}'"]
         Puppet::Util::Execution.expects(:execute).with(expected_args, execute_options).raises Puppet::ExecutionFailure.new("package #{resource_name} is not installed")
       end
 
@@ -317,7 +317,7 @@ describe provider_class do
 
       it "does not log or fail if allow_virtual is true" do
         resource[:allow_virtual] = true
-        expected_args = ['/bin/rpm', '-q', resource_name, '--nosignature', '--nodigest', '--qf', nevra_format, '--whatprovides']
+        expected_args = ['/bin/rpm', '-q', resource_name, '--nosignature', '--nodigest', '--qf', "'#{nevra_format}'", '--whatprovides']
         Puppet::Util::Execution.expects(:execute).with(expected_args, execute_options).raises Puppet::ExecutionFailure.new("package #{resource_name} is not provided")
         expect(provider.query).to be_nil
       end
@@ -325,7 +325,7 @@ describe provider_class do
 
     it "parses virtual package" do
       provider.resource[:allow_virtual] = true
-      expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", nevra_format]
+      expected_args = ["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", "'#{nevra_format}'"]
       Puppet::Util::Execution.expects(:execute).with(expected_args, execute_options).raises Puppet::ExecutionFailure.new("package #{resource_name} is not installed")
       Puppet::Util::Execution.expects(:execute).with(expected_args + ["--whatprovides"], execute_options).returns "myresource 0 1.2.3.4 5.el4 noarch\n"
       expect(provider.query).to eq({

data/spec/unit/provider/service/smf_spec.rb

@@ -18,6 +18,8 @@ describe provider_class, :if => Puppet.features.posix? do
 
     FileTest.stubs(:file?).with('/usr/sbin/svcadm').returns true
     FileTest.stubs(:executable?).with('/usr/sbin/svcadm').returns true
+    FileTest.stubs(:file?).with('/usr/sbin/svccfg').returns true
+    FileTest.stubs(:executable?).with('/usr/sbin/svccfg').returns true
     FileTest.stubs(:file?).with('/usr/bin/svcs').returns true
     FileTest.stubs(:executable?).with('/usr/bin/svcs').returns true
     Facter.stubs(:value).with(:operatingsystem).returns('Solaris')
@@ -74,9 +76,9 @@ describe provider_class, :if => Puppet.features.posix? do
       @provider.expects(:svcs).with('-H', '-o', 'state,nstate', "/system/myservice").returns("online\t-")
       @provider.status
     end
-    it "should return stopped if svcs can't find the service" do
+    it "should return absent if svcs can't find the service" do
       @provider.stubs(:svcs).raises(Puppet::ExecutionFailure.new("no svc found"))
-      expect(@provider.status).to eq(:stopped)
+      expect(@provider.status).to eq(:absent)
     end
     it "should return running if online in svcs output" do
       @provider.stubs(:svcs).returns("online\t-")
@@ -107,14 +109,14 @@ describe provider_class, :if => Puppet.features.posix? do
   describe "when starting" do
     it "should enable the service if it is not enabled" do
       @provider.expects(:status).returns :stopped
-      @provider.expects(:texecute).with(:start, ['/usr/sbin/svcadm', :enable, '-s', '/system/myservice'], true)
+      @provider.expects(:texecute).with(:start, ['/usr/sbin/svcadm', :enable, '-rs', '/system/myservice'], true)
       @provider.expects(:wait).with('online')
       @provider.start
     end
 
     it "should always execute external command 'svcadm enable /system/myservice'" do
       @provider.expects(:status).returns :running
-      @provider.expects(:texecute).with(:start, ['/usr/sbin/svcadm', :enable, '-s', '/system/myservice'], true)
+      @provider.expects(:texecute).with(:start, ['/usr/sbin/svcadm', :enable, '-rs', '/system/myservice'], true)
       @provider.expects(:wait).with('online')
       @provider.start
     end
@@ -135,7 +137,7 @@ describe provider_class, :if => Puppet.features.posix? do
 
     it "should error if timeout occurs while starting the service" do
       @provider.expects(:status).returns :stopped
-      @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, "-s", "/system/myservice"], true)
+      @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, '-rs', "/system/myservice"], true)
       Timeout.expects(:timeout).with(60).raises(Timeout::Error)
       expect { @provider.start }.to raise_error Puppet::Error, ('Timed out waiting for /system/myservice to transition states')
     end
@@ -150,7 +152,7 @@ describe provider_class, :if => Puppet.features.posix? do
 
     it "should import the manifest if service is missing" do
       @provider.expects(:svccfg).with(:import, "/tmp/myservice.xml")
-      @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, "-s", "/system/myservice"], true)
+      @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, '-rs', "/system/myservice"], true)
       @provider.expects(:wait).with('online')
       @provider.expects(:svcs).with('-H', '-o', 'state,nstate', "/system/myservice").returns("online\t-")
       @provider.start
@@ -164,13 +166,13 @@ describe provider_class, :if => Puppet.features.posix? do
 
   describe "when stopping" do
     it "should execute external command 'svcadm disable /system/myservice'" do
-      @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, "-s", "/system/myservice"], true)
+      @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, '-s', "/system/myservice"], true)
       @provider.expects(:wait).with('offline', 'disabled', 'uninitialized')
       @provider.stop
     end
 
     it "should error if timeout occurs while stopping the service" do
-      @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, "-s", "/system/myservice"], true)
+      @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, '-s', "/system/myservice"], true)
       Timeout.expects(:timeout).with(60).raises(Timeout::Error)
       expect { @provider.stop }.to raise_error Puppet::Error, ('Timed out waiting for /system/myservice to transition states')
     end
@@ -179,7 +181,7 @@ describe provider_class, :if => Puppet.features.posix? do
   describe "when restarting" do
 
     it "should error if timeout occurs while restarting the service" do
-      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
+      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, '-s', "/system/myservice"], true)
       Timeout.expects(:timeout).with(60).raises(Timeout::Error)
       expect { @provider.restart }.to raise_error Puppet::Error, ('Timed out waiting for /system/myservice to transition states')
     end
@@ -196,7 +198,7 @@ describe provider_class, :if => Puppet.features.posix? do
     context 'with :operatingsystemrelease == 11.2' do
       it "should call 'svcadm restart -s /system/myservice'" do
         Facter.stubs(:value).with(:operatingsystemrelease).returns '11.2'
-        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, '-s', "/system/myservice"], true)
         @provider.expects(:wait).with('online')
         @provider.restart
       end
@@ -205,7 +207,7 @@ describe provider_class, :if => Puppet.features.posix? do
     context 'with :operatingsystemrelease > 11.2' do
       it "should call 'svcadm restart -s /system/myservice'" do
         Facter.stubs(:value).with(:operatingsystemrelease).returns '11.3'
-        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, '-s', "/system/myservice"], true)
         @provider.expects(:wait).with('online')
         @provider.restart
       end

data/spec/unit/provider/service/systemd_spec.rb

@@ -21,7 +21,7 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     described_class.new(:name => 'sshd.service')
   end
 
-  osfamily = [ 'archlinux' ]
+  osfamily = [ 'archlinux', 'coreos' ]
 
   osfamily.each do |osfamily|
     it "should be the default provider on #{osfamily}" do
@@ -224,6 +224,13 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
       expect(provider.enabled?).to eq(:false)
     end
 
+    it "should return :false if the service is indirect" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
+      provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "indirect\n"
+      $CHILD_STATUS.stubs(:exitstatus).returns(0)
+      expect(provider.enabled?).to eq(:false)
+    end
+
     it "should return :false if the service is masked and the resource is attempting to be disabled" do
       provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :enable => false))
       provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "masked\n"

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

@@ -438,6 +438,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     end
 
     it "should raise an error if the shell is not executable" do
+      FileTest.stubs(:executable?).with('LICENSE').returns false
       resource[:shell] = 'LICENSE'
       expect { provider.check_valid_shell }.to raise_error(Puppet::Error, /Shell LICENSE must be executable/)
     end

data/spec/unit/puppet_spec.rb

@@ -39,6 +39,20 @@ describe Puppet do
     expect($LOAD_PATH).to include two
   end
 
+  context "Puppet::OLDEST_RECOMMENDED_RUBY_VERSION" do
+    it "should have an oldest recommended ruby version constant" do
+      expect(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION).not_to be_nil
+    end
+
+    it "should be a string" do
+      expect(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION).to be_a_kind_of(String)
+    end
+
+    it "should match a semver version" do
+      expect(SemVer).to be_valid(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION)
+    end
+  end
+
   context "newtype" do
     it "should issue a deprecation warning" do
       subject.expects(:deprecation_warning).with("Creating sometype via Puppet.newtype is deprecated and will be removed in a future release. Use Puppet::Type.newtype instead.")

data/spec/unit/resource/catalog_spec.rb

@@ -67,7 +67,8 @@ describe Puppet::Resource::Catalog, "when compiling" do
     Puppet[:classfile] = File.expand_path("/class/file")
 
     fh = mock 'filehandle'
-    File.expects(:open).with(Puppet[:classfile], "w").yields fh
+    classfile = Puppet.settings.setting(:classfile)
+    Puppet::FileSystem.expects(:open).with(classfile.value, classfile.mode.to_i(8), "w:UTF-8").yields fh
 
     fh.expects(:puts).with "foo\nbar"
 
@@ -719,7 +720,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
     end
 
     it "should only write when it is a host catalog" do
-      File.expects(:open).with(@file).never
+      Puppet::FileSystem.expects(:open).with(@file, 0640, "w:UTF-8").never
       @catalog.host_config = false
       Puppet[:graph] = true
       @catalog.write_graph(@name)
@@ -850,10 +851,15 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to pson"
         Puppet[:rich_data] = true
       end
 
+      after(:each) do
+        Puppet[:rich_data] = false
+      end
+
+
       let(:catalog_w_regexp)  { compile_to_catalog("notify {'foo': message => /[a-z]+/ }") }
 
       it 'should generate ext_parameters for parameter values that are not Data' do
-        expect(catalog_w_regexp.to_json).to include('"ext_parameters":{"message":[48,"[a-z]+"]}')
+        expect(catalog_w_regexp.to_json).to include('"ext_parameters":{"message":[[48,"[a-z]+"]]}')
       end
 
       it 'should validate ext_parameters against the schema' do
@@ -871,16 +877,16 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to pson"
         catalog = compile_to_catalog("notify {'foo': message => SemVer('1.0.0') }")
         catalog2 = Puppet::Resource::Catalog.from_data_hash(JSON.parse(catalog.to_json))
         message = catalog2.resource('notify', 'foo')['message']
-        expect(message).to be_a(Semantic::Version)
-        expect(message).to eql(Semantic::Version.parse('1.0.0'))
+        expect(message).to be_a(SemanticPuppet::Version)
+        expect(message).to eql(SemanticPuppet::Version.parse('1.0.0'))
       end
 
       it 'should read and convert ext_parameters containing VersionRange from json' do
         catalog = compile_to_catalog("notify {'foo': message => SemVerRange('>=1.0.0') }")
         catalog2 = Puppet::Resource::Catalog.from_data_hash(JSON.parse(catalog.to_json))
         message = catalog2.resource('notify', 'foo')['message']
-        expect(message).to be_a(Semantic::VersionRange)
-        expect(message).to eql(Semantic::VersionRange.parse('>=1.0.0'))
+        expect(message).to be_a(SemanticPuppet::VersionRange)
+        expect(message).to eql(SemanticPuppet::VersionRange.parse('>=1.0.0'))
       end
 
       it 'should read and convert ext_parameters containing Timespan from json' do
@@ -904,7 +910,7 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to pson"
         catalog2 = Puppet::Resource::Catalog.from_data_hash(JSON.parse(catalog.to_json))
         message = catalog2.resource('notify', 'foo')['message']
         expect(message).to be_a(Hash)
-        expect(message['version']).to eql(Semantic::Version.parse('1.0.0'))
+        expect(message['version']).to eql(SemanticPuppet::Version.parse('1.0.0'))
         expect(message['time']).to eql(Puppet::Pops::Time::Timestamp.parse('2016-09-15T08:32:16.123 UTC'))
       end
 
@@ -913,7 +919,7 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to pson"
         catalog2 = Puppet::Resource::Catalog.from_data_hash(JSON.parse(catalog.to_json))
         message = catalog2.resource('notify', 'foo')['message']
         expect(message).to be_a(Array)
-        expect(message[0]).to eql(Semantic::Version.parse('1.0.0'))
+        expect(message[0]).to eql(SemanticPuppet::Version.parse('1.0.0'))
         expect(message[1]).to eql(Puppet::Pops::Time::Timestamp.parse('2016-09-15T08:32:16.123 UTC'))
       end
     end

data/spec/unit/resource_spec.rb

@@ -8,6 +8,10 @@ describe Puppet::Resource do
   let(:basepath) { make_absolute("/somepath") }
   let(:environment) { Puppet::Node::Environment.create(:testing, []) }
 
+  def expect_lookup(key)
+    Puppet::Pops::Lookup::GlobalDataProvider.any_instance.expects(:unchecked_key_lookup).with(Puppet::Pops::Lookup::LookupKey.new(key), any_parameters)
+  end
+
   [:catalog, :file, :line].each do |attr|
     it "should have an #{attr} attribute" do
       resource = Puppet::Resource.new("file", "/my/file")
@@ -337,15 +341,14 @@ describe Puppet::Resource do
           end
 
           it "should query the data_binding terminus using a namespaced key" do
-            Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-            Puppet::DataBinding.indirection.expects(:find).with(
-              'apache::port', all_of(has_key(:environment), has_key(:variables)))
+            expect_lookup('lookup_options').throws(:no_such_key)
+            expect_lookup('apache::port')
             inject_and_set_defaults(resource, scope)
           end
 
           it "should use the value from the data_binding terminus" do
-            Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-            Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).returns('443')
+            expect_lookup('lookup_options').throws(:no_such_key)
+            expect_lookup('apache::port').returns('443')
 
             inject_and_set_defaults(resource, scope)
 
@@ -353,8 +356,8 @@ describe Puppet::Resource do
           end
 
           it 'should use the default value if no value is found using the data_binding terminus' do
-            Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-            Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).throws(:no_such_key)
+            expect_lookup('lookup_options').throws(:no_such_key)
+            expect_lookup('apache::port').throws(:no_such_key)
 
             inject_and_set_defaults(resource, scope)
 
@@ -362,8 +365,8 @@ describe Puppet::Resource do
           end
 
           it 'should use the default value if an undef value is found using the data_binding terminus' do
-            Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-            Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).returns(nil)
+            expect_lookup('lookup_options').throws(:no_such_key)
+            expect_lookup('apache::port').returns(nil)
 
             inject_and_set_defaults(resource, scope)
 
@@ -371,8 +374,8 @@ describe Puppet::Resource do
           end
 
           it "should fail with error message about data binding on a hiera failure" do
-            Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-            Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).raises(Puppet::DataBinding::LookupError, 'Forgettabotit')
+            expect_lookup('lookup_options').throws(:no_such_key)
+            expect_lookup('apache::port').raises(Puppet::DataBinding::LookupError, 'Forgettabotit')
             expect {
               inject_and_set_defaults(resource, scope)
             }.to raise_error(Puppet::Error, /Lookup of key 'apache::port' failed: Forgettabotit/)
@@ -408,8 +411,8 @@ describe Puppet::Resource do
           end
 
           it "should use the value from the data_binding terminus when provided value is undef" do
-            Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-            Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).returns('443')
+            expect_lookup('lookup_options').throws(:no_such_key)
+            expect_lookup('apache::port').returns('443')
 
             rs = Puppet::Parser::Resource.new("class", "apache", :scope => scope,
               :parameters => [Puppet::Parser::Resource::Param.new({ :name => 'port', :value => nil })])
@@ -425,8 +428,8 @@ describe Puppet::Resource do
         let(:resource) { Puppet::Parser::Resource.new("class", "apache", :scope => scope) }
 
         it "should use the value from the data_binding terminus" do
-          Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-          Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).returns('443')
+          expect_lookup('lookup_options').throws(:no_such_key)
+          expect_lookup('apache::port').returns('443')
 
           inject_and_set_defaults(resource, scope)
 
@@ -434,8 +437,8 @@ describe Puppet::Resource do
         end
 
         it "should use an undef value from the data_binding terminus" do
-          Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
-          Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).returns(nil)
+          expect_lookup('lookup_options').throws(:no_such_key)
+          expect_lookup('apache::port').returns(nil)
 
           inject_and_set_defaults(resource, scope)
 

data/spec/unit/semver_spec.rb

@@ -212,6 +212,20 @@ describe SemVer do
       expect(version.tiny).to    eq(5)
       expect(version.special).to eq('-beta6')
     end
+
+    it 'should not log a deprecation warning when strict == off' do
+      Puppet[:strict] = :off
+      SemVer.new('1.2.3')
+      expect(@logs).to be_empty
+    end
+
+    it 'should log a deprecation warning unless strict == off' do
+      (Puppet.settings.setting(:strict).values - [:off]).each do |setting|
+        Puppet[:strict] = setting
+        SemVer.new('1.2.3')
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+    end
   end
 
   describe '#matched_by?' do

data/spec/unit/ssl/certificate_authority_spec.rb

@@ -795,6 +795,12 @@ describe Puppet::SSL::CertificateAuthority do
       expect(@ca.list_certificates).to eq([cert1, cert2])
     end
 
+    it "should print a deprecation when using #list_certificates" do
+      Puppet::SSL::Certificate.indirection.stubs(:search).with("*").returns [:foo, :bar]
+      Puppet.expects(:deprecation_warning).with(regexp_matches(/list_certificates is deprecated/))
+      @ca.list_certificates
+    end
+
     describe "and printing certificates" do
       it "should return nil if the certificate cannot be found" do
         Puppet::SSL::Certificate.indirection.expects(:find).with("myhost").returns nil
@@ -927,7 +933,7 @@ describe Puppet::SSL::CertificateAuthority do
           expect(@ca.certificate_is_alive?(@cert)).to be_truthy
         end
 
-        it "should used a cached instance of the x509 store" do
+        it "should use a cached instance of the x509 store" do
           OpenSSL::X509::Store.stubs(:new).returns(@store).once
 
           @cert.expects(:content).returns "mycert"
@@ -937,6 +943,11 @@ describe Puppet::SSL::CertificateAuthority do
           @ca.certificate_is_alive?(@cert)
           @ca.certificate_is_alive?(@cert)
         end
+
+        it "should be deprecated" do
+          Puppet.expects(:deprecation_warning).with(regexp_matches(/certificate_is_alive\? is deprecated/))
+          @ca.certificate_is_alive?(@cert)
+        end
       end
     end
 

data/spec/unit/transaction/additional_resource_generator_spec.rb

@@ -182,6 +182,17 @@ describe Puppet::Transaction::AdditionalResourceGenerator do
         'Generator[thing]', 'Whit[completed_thing]')
     end
 
+    it "should tag the sentinel with the tags of the resource" do
+      graph = relationships_after_eval_generating(<<-MANIFEST, 'Generator[thing]')
+        generator { thing:
+          code => 'notify { hello: }',
+          tag  => 'foo',
+        }
+      MANIFEST
+      whit = find_vertex(graph, :whit, "completed_thing")
+      expect(whit.tags).to be_superset(['thing', 'foo', 'generator'].to_set)
+    end
+
     it "should contain the generated resources in the same container as the generator" do
       catalog = compile_to_ral(<<-MANIFEST)
         class container {

data/spec/unit/type/user_spec.rb

@@ -351,13 +351,39 @@ describe Puppet::Type.type(:user) do
       @user = described_class.new(:name => 'foo', :comment => @value)
     end
 
-    it "should be converted to ASCII_8BIT for ruby 1.9 / 2.0", :if => RUBY_VERSION < "2.1.0" && String.method_defined?(:encode) do
-      expect(@user[:comment].encoding).to eq(Encoding::ASCII_8BIT)
-      expect(@user[:comment]).to eq(@value.force_encoding(Encoding::ASCII_8BIT))
-    end
+    describe "#insync" do
+      it "should delegate to the provider's #comments_insync? method if defined" do
+        # useradd subclasses nameservice and thus inherits #comments_insync?
+        user = described_class.new(:name => 'foo', :comment => @value, :provider => :useradd)
+        comment_property = user.properties.find {|p| p.name == :comment}
+        user.provider.expects(:comments_insync?)
+        comment_property.insync?('bar')
+      end
+
+      describe "#change_to_s" do
+        let(:is) { "\u2603" }
+        let(:should) { "\u06FF" }
+        let(:comment_property) { @user.properties.find { |p| p.name == :comment } }
+        context "given is and should strings with incompatible encoding" do
+          it "should return a formatted string" do
+            is.force_encoding(Encoding::ASCII_8BIT)
+            should.force_encoding(Encoding::UTF_8)
+            expect(Encoding.compatible?(is, should)).to be_falsey
+            # append Regexp with 'n' to set encoding to ASCII_8BIT
+            expect(comment_property.change_to_s(is,should)).to match(/changed '\xE2\x98\x83' to '\xDB\xBF'/n)
+          end
+        end
 
-    it "must not be converted for ruby >= 2.1", :if => RUBY_VERSION >= "2.1.0" do
-      expect(@user[:comment].encoding).to eq(Encoding::UTF_8)
+        context "given is and should strings with compatible encoding" do
+          it "should return a formatted string" do
+            is.force_encoding(Encoding::UTF_8)
+            should.force_encoding(Encoding::UTF_8)
+            expect(Encoding.compatible?(is, should)).to be_truthy
+            # append Regexp with 'u' to set encoding to UTF_8
+            expect(comment_property.change_to_s(is,should)).to match(/changed '\u2603' to '\u06FF'/u)
+          end
+        end
+      end
     end
   end
 

data/spec/unit/util/filetype_spec.rb

@@ -17,7 +17,7 @@ describe Puppet::Util::FileType do
     describe "when the file already exists" do
       it "should return the file's contents when asked to read it" do
         Puppet::FileSystem.expects(:exist?).with(path).returns true
-        File.expects(:read).with(path).returns "my text"
+        Puppet::FileSystem.expects(:read).with(path, :encoding => Encoding.default_external).returns "my text"
 
         expect(file.read).to eq("my text")
       end
@@ -46,7 +46,7 @@ describe Puppet::Util::FileType do
       end
 
       it "should first create a temp file and copy its contents over to the file location" do
-        Tempfile.expects(:new).with("puppet").returns tempfile
+        Tempfile.expects(:new).with("puppet", :encoding => Encoding.default_external).returns tempfile
         tempfile.expects(:print).with("my text")
         tempfile.expects(:flush)
         tempfile.expects(:close)
@@ -151,7 +151,7 @@ describe Puppet::Util::FileType do
         @tmp_cron = Tempfile.new("puppet_crontab_spec")
         @tmp_cron_path = @tmp_cron.path
         Puppet::Util.stubs(:uid).with(uid).returns 9000
-        Tempfile.expects(:new).with("puppet_#{name}").returns @tmp_cron
+        Tempfile.expects(:new).with("puppet_#{name}", :encoding => Encoding.default_external).returns @tmp_cron
       end
 
       after :each do

data/spec/unit/util/yaml_spec.rb

@@ -60,7 +60,7 @@ describe Puppet::Util::Yaml do
   end
 
   def write_file(name, contents)
-    File.open(name, "w") do |fh|
+    File.open(name, "w:UTF-8") do |fh|
       fh.write(contents)
     end
   end

data/spec/unit/util_spec.rb

@@ -181,15 +181,23 @@ describe Puppet::Util do
       end
     end
 
-    # but in 2.3, the behavior is correct when external codepage is 65001 / UTF-8
+    # but in 2.3, the behavior is mostly correct when external codepage is 65001 / UTF-8
     it "works around Ruby bug 8822 (which fails to preserve UTF-8 properly when accessing ENV) (Ruby >= 2.3.x) ",
       :if => ((match = RUBY_VERSION.match(/^2\.(\d+)\./)) && match.captures[0].to_i >= 3 && Puppet.features.microsoft_windows?) do
 
+      raise 'This test requires a non-UTF8 codepage' if Encoding.default_external == Encoding::UTF_8
+
       withenv_utf8 do |utf_8_key, utf_8_value, codepage_key|
         # Ruby 2.3 fixes access by the original UTF-8 key, and behaves differently than 2.1
         # keying by local codepage will work only when the UTF-8 can be converted to local codepage
         # the key selected for this test contains characters unavailable to a local codepage, hence doesn't work
-        expect(ENV.key?(codepage_key)).to eq(false)
+
+        # On Japanese Windows (Code Page 932) this test resolves as true.
+        # otherwise the key selected for this test contains characters
+        # unavailable to a local codepage, hence doesn't work
+        # HACK: tech debt to replace once PUP-7019 is understood
+        should_be_found = (Encoding.default_external == Encoding::CP932)
+        expect(ENV.key?(codepage_key)).to eq(should_be_found)
         expect(ENV.key?(utf_8_key)).to eq(true)
 
         # Ruby's ENV.keys has slightly different behavior than ENV.key?(key), and 2.3 differs from 2.1

data/tasks/i18n.rake

@@ -0,0 +1,20 @@
+# These tasks wrap tasks from the gettext-setup gem, used when generating
+# translation files. If you want to use a new task in the gettext-setup
+# gem, add a wrapper for it here to expose it in the Puppet repo.
+namespace :gettext do
+  task :load_gettext_tasks do
+    spec = Gem::Specification.find_by_name 'gettext-setup'
+    load "#{spec.gem_dir}/lib/tasks/gettext.rake"
+    GettextSetup.initialize(File.absolute_path('../locales', File.dirname(__FILE__)))
+  end
+
+  desc "Generate a new POT file"
+  task :generate_pot => :load_gettext_tasks do
+    Rake::Task["gettext:pot"].invoke
+  end
+
+  desc "Generate a PO file for the given locale"
+  task :generate_po, [:language] => :load_gettext_tasks do |t, args|
+    Rake::Task["gettext:po"].invoke(args[:language])
+  end
+end