puppet 5.3.3-x64-mingw32 → 5.3.4-x64-mingw32

data/spec/fixtures/unit/application/environments/production/data/common.yaml

@@ -18,5 +18,7 @@ f.one:
 
 ab: "%{hiera('a')} and %{hiera('b')}"
 
+g: "This is%{facts.cx} in facts hash"
+
 lookup_options:
   a: first

data/spec/integration/agent/logging_spec.rb

@@ -71,6 +71,8 @@ describe 'agent logging' do
     before(:each) do
       # Don't actually run the agent, bypassing cert checks, forking and the puppet run itself
       Puppet::Application::Agent.any_instance.stubs(:run_command)
+      # Let exceptions be raised instead of exiting
+      Puppet::Application::Agent.any_instance.stubs(:exit_on_fail).yields
     end
 
     def double_of_bin_puppet_agent_call(argv)

data/spec/integration/faces/plugin_spec.rb

@@ -28,6 +28,7 @@ describe "Puppet plugin face" do
   before do
     FileUtils.mkdir(File.join(Puppet[:vardir], 'lib'))
     FileUtils.mkdir(File.join(Puppet[:vardir], 'facts.d'))
+    FileUtils.mkdir(File.join(Puppet[:vardir], 'locales'))
     @termini_classes = {}
     INDIRECTED_CLASSES.each do |indirected|
       @termini_classes[indirected] = indirected.indirection.terminus_class

data/spec/integration/network/authconfig_spec.rb

@@ -97,13 +97,13 @@ describe Puppet::Network::AuthConfig do
     it 'should warn about missing path before allow_ip in stanza' do
       expect {
         add_raw_stanza("allow_ip 10.0.0.1\n")
-      }.to raise_error Puppet::ConfigurationError, /Missing or invalid 'path' before right directive at line.*/
+      }.to raise_error Puppet::ConfigurationError, /Missing or invalid 'path' before right directive at \(line: .*\)/
     end
 
     it 'should warn about missing path before allow in stanza' do
       expect {
         add_raw_stanza("allow host.domain.com\n")
-      }.to raise_error Puppet::ConfigurationError, /Missing or invalid 'path' before right directive at line.*/
+      }.to raise_error Puppet::ConfigurationError, /Missing or invalid 'path' before right directive at \(line: .*\)/
     end
 
     it "should support hostname backreferences" do

data/spec/integration/parser/collection_spec.rb

@@ -342,13 +342,13 @@ describe 'collectors' do
           Puppet[:strict] = :warning
           expect_the_message_to_be(['given'], manifest)
           expect(warnings).to include(
-            /Attempt to override an already evaluated resource, defined at line 4, with new values at line 6/)
+            /Attempt to override an already evaluated resource, defined at \(line: 4\), with new values \(line: 6\)/)
         end
 
         it 'and --strict=error, it fails compilation' do
           Puppet[:strict] = :error
           expect { compile_to_catalog(manifest) }.to raise_error(
-            /Attempt to override an already evaluated resource, defined at line 4, with new values at line 6/)
+            /Attempt to override an already evaluated resource, defined at \(line: 4\), with new values \(line: 6\)/)
           expect(warnings).to be_empty
         end
       end

data/spec/integration/parser/scope_spec.rb

@@ -47,7 +47,7 @@ describe "Two step scoping for variables" do
           compile_to_catalog("$name = 'never in a 0xF4240 years'", enc_node)
         }.to raise_error(
           Puppet::Error,
-          /Cannot reassign built in \(or already assigned\) variable '\$name' at line 1(\:7)? on node the_node/
+          /Cannot reassign built in \(or already assigned\) variable '\$name' \(line: 1(, column: 7)?\) on node the_node/
         )
     end
 
@@ -58,7 +58,7 @@ describe "Two step scoping for variables" do
           compile_to_catalog("$title = 'never in a 0xF4240 years'", enc_node)
         }.to raise_error(
           Puppet::Error,
-          /Cannot reassign built in \(or already assigned\) variable '\$title' at line 1(\:8)? on node the_node/
+          /Cannot reassign built in \(or already assigned\) variable '\$title' \(line: 1(, column: 8)?\) on node the_node/
         )
     end
 
@@ -316,6 +316,19 @@ describe "Two step scoping for variables" do
       end
     end
 
+    it 'resolves a qualified name in class parameter scope' do
+      expect_the_message_to_be('Does it work? Yes!') do <<-PUPPET
+        class a ( 
+          $var1 = 'Does it work?',
+          $var2 = "${a::var1} Yes!"
+        ) { 
+          notify { 'something': message => $var2 }
+        }
+        include a
+        PUPPET
+      end
+    end
+
     it "finds values in its inherited scope when the inherited class is qualified to the top" do
       expect_the_message_to_be('foo_msg') do <<-MANIFEST
             node default {
@@ -682,7 +695,7 @@ describe "Two step scoping for variables" do
         compile_to_catalog("$var = 'top scope'", enc_node)
       }.to raise_error(
         Puppet::Error,
-        /Cannot reassign variable '\$var' at line 1(\:6)? on node the_node/
+        /Cannot reassign variable '\$var' \(line: 1(, column: 6)?\) on node the_node/
       )
     end
 

data/spec/integration/provider/cron/crontab_spec.rb

@@ -10,6 +10,7 @@ describe Puppet::Type.type(:cron).provider(:crontab), '(integration)', :unless =
 
   before :each do
     Puppet::Type.type(:cron).stubs(:defaultprovider).returns described_class
+    described_class.stubs(:suitable?).returns true
     Puppet::FileBucket::Dipper.any_instance.stubs(:backup) # Don't backup to filebucket
 
     # I don't want to execute anything

data/spec/integration/transaction/report_spec.rb

@@ -3,6 +3,11 @@ require 'spec_helper'
 require 'puppet_spec/files'
 
 describe Puppet::Transaction::Report do
+  before :each do
+    # Enable persistence during tests
+    Puppet::Transaction::Persistence.any_instance.stubs(:enabled?).returns(true)
+  end
+
   describe "when using the indirector" do
     after do
       Puppet.settings.stubs(:use)

data/spec/lib/matchers/json.rb

@@ -28,6 +28,7 @@ module JSONMatchers
     end
 
     def matches?(instance)
+      @instance = instance
       result = attr_value(@attributes, instance)
       if @value
         result == @value
@@ -36,19 +37,19 @@ module JSONMatchers
       end
     end
 
-    def failure_message(instance)
+    def failure_message
       if @value
-        "expected #{instance.inspect} to set #{@attributes.inspect} to #{@value.inspect}; got #{attr_value(@attributes, instance).inspect}"
+        "expected #{@instance.inspect} to set #{@attributes.inspect} to #{@value.inspect}; got #{attr_value(@attributes, @instance).inspect}"
       else
-        "expected #{instance.inspect} to set #{@attributes.inspect} but was nil"
+        "expected #{@instance.inspect} to set #{@attributes.inspect} but was nil"
       end
     end
 
-    def failure_message_when_negated(instance)
+    def failure_message_when_negated
       if @value
-        "expected #{instance.inspect} not to set #{@attributes.inspect} to #{@value.inspect}"
+        "expected #{@instance.inspect} not to set #{@attributes.inspect} to #{@value.inspect}"
       else
-        "expected #{instance.inspect} not to set #{@attributes.inspect} to nil"
+        "expected #{@instance.inspect} not to set #{@attributes.inspect} to nil"
       end
     end
   end
@@ -74,7 +75,7 @@ module JSONMatchers
 
     def matches?(klass)
       raise "Must specify json with 'from'" unless @json
-
+      @klass = klass
       @instance = format.intern(klass, @json)
       if @value
         @instance.send(@attribute) == @value
@@ -83,19 +84,19 @@ module JSONMatchers
       end
     end
 
-    def failure_message(klass)
+    def failure_message
       if @value
-        "expected #{klass} to read #{@attribute} from #{@json} as #{@value.inspect}; got #{@instance.send(@attribute).inspect}"
+        "expected #{@klass} to read #{@attribute} from #{@json} as #{@value.inspect}; got #{@instance.send(@attribute).inspect}"
       else
-        "expected #{klass} to read #{@attribute} from #{@json} but was nil"
+        "expected #{@klass} to read #{@attribute} from #{@json} but was nil"
       end
     end
 
-    def failure_message_when_negated(klass)
+    def failure_message_when_negated
       if @value
-        "expected #{klass} not to set #{@attribute} to #{@value}"
+        "expected #{@klass} not to set #{@attribute} to #{@value}"
       else
-        "expected #{klass} not to set #{@attribute} to nil"
+        "expected #{@klass} not to set #{@attribute} to nil"
       end
     end
   end

data/spec/unit/agent_spec.rb

@@ -258,6 +258,39 @@ describe Puppet::Agent do
         expect(agent.should_fork).to be_falsey
       end
     end
+
+    describe 'when runtimeout is set' do
+      before(:each) do
+        Puppet[:runtimeout] = 1
+      end
+
+      it 'times out when a run exceeds the set limit' do
+        client = AgentTestClient.new
+        client.instance_eval do
+          # Stub methods used to set test expectations.
+          def processing; end
+          def handling; end
+
+          def run(client_options = {})
+            # Simulate a hanging agent operation that also traps errors.
+            begin
+              ::Kernel.sleep(5)
+              processing()
+            rescue
+              handling()
+            end
+          end
+        end
+
+        AgentTestClient.expects(:new).returns client
+
+        client.expects(:processing).never
+        client.expects(:handling).never
+        Puppet.expects(:log_exception).with(instance_of(Puppet::Agent::RunTimeoutError), anything)
+
+        expect(@agent.run).to eq(1)
+      end
+    end
   end
 
   describe "when checking execution state" do

data/spec/unit/application/config_spec.rb

@@ -6,4 +6,8 @@ describe Puppet::Application::Config do
   it "should be a subclass of Puppet::Application::FaceBase" do
     expect(Puppet::Application::Config.superclass).to equal(Puppet::Application::FaceBase)
   end
+
+  it "should set `environment_mode` to :not_required" do
+    expect(Puppet::Application::Config.get_environment_mode).to equal(:not_required)
+  end
 end

data/spec/unit/application/lookup_spec.rb

@@ -498,6 +498,8 @@ Searching for "a"
     end
 
     context 'the global scope' do
+      include PuppetSpec::Files
+
       it "is unaffected by global variables unless '--compile' is used" do
         lookup.options[:node] = node
         lookup.command_line.stubs(:args).returns(['c'])
@@ -510,6 +512,34 @@ Searching for "a"
         lookup.command_line.stubs(:args).returns(['c'])
         expect(run_lookup(lookup)).to eql("--- This is C from site.pp\n...")
       end
+
+      it 'receives extra facts in top scope' do
+        file_path = tmpdir('lookup_spec')
+        filename = File.join(file_path, "facts.yaml")
+        File.open(filename, "w+") { |f| f.write(<<-YAML.unindent) }
+          ---
+          cx: ' C from facts'
+          YAML
+
+        lookup.options[:node] = node
+        lookup.options[:fact_file] = filename
+        lookup.command_line.stubs(:args).returns(['c'])
+        expect(run_lookup(lookup)).to eql("--- This is C from facts\n...")
+      end
+
+      it 'receives extra facts in the facts hash' do
+        file_path = tmpdir('lookup_spec')
+        filename = File.join(file_path, "facts.yaml")
+        File.open(filename, "w+") { |f| f.write(<<-YAML.unindent) }
+          ---
+          cx: ' G from facts'
+        YAML
+
+        lookup.options[:node] = node
+        lookup.options[:fact_file] = filename
+        lookup.command_line.stubs(:args).returns(['g'])
+        expect(run_lookup(lookup)).to eql("--- This is G from facts in facts hash\n...")
+      end
     end
 
     context 'using a puppet function as data provider' do

data/spec/unit/application_spec.rb

@@ -99,6 +99,24 @@ describe Puppet::Application do
     end
   end
 
+  describe ".environment_mode" do
+    it "should default to :local" do
+      expect(@appclass.get_environment_mode).to eq(:local)
+    end
+
+    it "should set and get a value" do
+      @appclass.environment_mode :remote
+      expect(@appclass.get_environment_mode).to eq(:remote)
+    end
+
+    it "should error if given a random symbol" do
+      expect{@appclass.environment_mode :foo}.to raise_error(/Invalid environment mode/)
+    end
+
+    it "should error if given a string" do
+      expect{@appclass.environment_mode 'local'}.to raise_error(/Invalid environment mode/)
+    end
+  end
 
 
   # These tests may look a little weird and repetative in its current state;

data/spec/unit/configurer/downloader_factory_spec.rb

@@ -14,6 +14,10 @@ describe Puppet::Configurer::DownloaderFactory do
     factory.create_plugin_facts_downloader(environment)
   end
 
+  let(:locales_downloader) do
+    factory.create_locales_downloader(environment)
+  end
+
   def ignores_source_permissions(downloader)
     expect(downloader.file[:source_permissions]).to eq(:ignore)
   end
@@ -93,4 +97,33 @@ describe Puppet::Configurer::DownloaderFactory do
       end
     end
   end
+
+  context "when creating a plugin downloader for module translations" do
+    it 'is named "locales"' do
+      expect(locales_downloader.name).to eq('locales')
+    end
+
+    it 'downloads files into Puppet[:localedest]' do
+      localedest = File.expand_path("/tmp/ldest")
+      Puppet[:localedest] = localedest
+
+      expect(locales_downloader.file[:path]).to eq(localedest)
+    end
+
+    it 'downloads files from Puppet[:localesource]' do
+      Puppet[:localesource] = 'puppet:///myotherlocales'
+
+      expect(locales_downloader.file[:source]).to eq([Puppet[:localesource]])
+    end
+
+    it 'ignores files from Puppet[:pluginsignore], plus config.yaml' do
+      Puppet[:pluginsignore] = 'lignore'
+
+      expect(locales_downloader.file[:ignore]).to eq(['lignore', 'config.yaml'])
+    end
+
+    it "ignores source permissions" do
+      ignores_source_permissions(locales_downloader)
+    end
+  end
 end

data/spec/unit/configurer/plugin_handler_spec.rb

@@ -8,29 +8,84 @@ describe Puppet::Configurer::PluginHandler do
   let(:pluginhandler) { Puppet::Configurer::PluginHandler.new(factory) }
   let(:environment)   { Puppet::Node::Environment.create(:myenv, []) }
 
-  before :each do
-    # PluginHandler#load_plugin has an extra-strong rescue clause
-    # this mock is to make sure that we don't silently ignore errors
-    Puppet.expects(:err).never
+
+  context "server agent version is 5.3.4" do
+
+    before :each do
+      # PluginHandler#load_plugin has an extra-strong rescue clause
+      # this mock is to make sure that we don't silently ignore errors
+      Puppet.expects(:err).never
+      # Server_agent version needs to be at 5.3.4 in order to mount locales
+      Puppet.push_context({:server_agent_version => "5.3.4"})
+    end
+
+    it "downloads plugins, facts, and locales" do
+      plugin_downloader = stub('plugin-downloader', :evaluate => [])
+      facts_downloader = stub('facts-downloader', :evaluate => [])
+      locales_downloader = stub('locales-downloader', :evaluate => [])
+
+      factory.expects(:create_plugin_downloader).returns(plugin_downloader)
+      factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
+      factory.expects(:create_locales_downloader).returns(locales_downloader)
+
+      pluginhandler.download_plugins(environment)
+    end
+
+    it "returns downloaded plugin, fact, and locale filenames" do
+      plugin_downloader = stub('plugin-downloader', :evaluate => %w[/a])
+      facts_downloader = stub('facts-downloader', :evaluate => %w[/b])
+      locales_downloader = stub('locales-downloader', :evaluate => %w[/c])
+
+      factory.expects(:create_plugin_downloader).returns(plugin_downloader)
+      factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
+      factory.expects(:create_locales_downloader).returns(locales_downloader)
+
+      expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b /c])
+    end
   end
 
-  it "downloads plugins and facts" do
-    plugin_downloader = stub('plugin-downloader', :evaluate => [])
-    facts_downloader = stub('facts-downloader', :evaluate => [])
+  context "server agent version is 5.3.3" do
+
+    before :each do
+      # PluginHandler#load_plugin has an extra-strong rescue clause
+      # this mock is to make sure that we don't silently ignore errors
+      Puppet.expects(:err).never
+      # Server_agent version needs to be at 5.3.4 in order to mount locales
+      Puppet.push_context({:server_agent_version => "5.3.3"})
+    end
 
-    factory.expects(:create_plugin_downloader).returns(plugin_downloader)
-    factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
+    it "returns downloaded plugin, fact, but not locale filenames" do
+      plugin_downloader = stub('plugin-downloader', :evaluate => %w[/a])
+      facts_downloader = stub('facts-downloader', :evaluate => %w[/b])
 
-    pluginhandler.download_plugins(environment)
+      factory.expects(:create_plugin_downloader).returns(plugin_downloader)
+      factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
+      factory.expects(:create_locales_downloader).never
+
+      expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
+    end
   end
 
-  it "returns downloaded plugin and fact filenames" do
-    plugin_downloader = stub('plugin-downloader', :evaluate => %w[/a])
-    facts_downloader = stub('facts-downloader', :evaluate => %w[/b])
+  context "blank server agent version" do
+    before :each do
+      # PluginHandler#load_plugin has an extra-strong rescue clause
+      # this mock is to make sure that we don't silently ignore errors
+      Puppet.expects(:err).never
+      # Server_agent version needs to be at 5.3.4 in order to mount locales
+      # A blank version will default to 0.0
+      Puppet.push_context({:server_agent_version => ""})
+    end
+
+    it "returns downloaded plugin, fact, but not locale filenames" do
+      plugin_downloader = stub('plugin-downloader', :evaluate => %w[/a])
+      facts_downloader = stub('facts-downloader', :evaluate => %w[/b])
+
+      factory.expects(:create_plugin_downloader).returns(plugin_downloader)
+      factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
+      factory.expects(:create_locales_downloader).never
 
-    factory.expects(:create_plugin_downloader).returns(plugin_downloader)
-    factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
+      expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
+    end
 
-    expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
   end
 end