puppet 5.1.0-universal-darwin → 5.2.0-universal-darwin

data/spec/fixtures/unit/provider/package/yum/yum-check-update-plugin-output.txt

@@ -0,0 +1,36 @@
+Loaded plugins: fastestmirror
+Loading mirror speeds from cached hostfile
+
+NetworkManager.x86_64              1:1.0.0-14.git20150121.b4ea599c.el7    base
+NetworkManager-glib.x86_64         1:1.0.0-14.git20150121.b4ea599c.el7    base
+NetworkManager-tui.x86_64          1:1.0.0-14.git20150121.b4ea599c.el7    base
+alsa-firmware.noarch               1.0.28-2.el7                           base
+alsa-lib.x86_64                    1.0.28-2.el7                           base
+audit.x86_64                       2.4.1-5.el7                            base
+audit-libs.x86_64                  2.4.1-5.el7                            base
+authconfig.x86_64                  6.2.8-9.el7                            base
+avahi.x86_64                       0.6.31-14.el7                          base
+avahi-autoipd.x86_64               0.6.31-14.el7                          base
+avahi-libs.x86_64                  0.6.31-14.el7                          base
+bash.x86_64                        4.2.46-12.el7                          base
+bind-libs-lite.x86_64              32:9.9.4-18.el7_1.1                    updates
+bind-license.noarch                32:9.9.4-18.el7_1.1                    updates
+binutils.x86_64                    2.23.52.0.1-30.el7_1.2                 updates
+biosdevname.x86_64                 0.6.1-2.el7                            base
+btrfs-progs.x86_64                 3.16.2-1.el7                           base
+ca-certificates.noarch             2015.2.4-70.0.el7_1                    updates
+centos-logos.noarch                70.0.6-2.el7.centos                    updates
+centos-release.x86_64              7-1.1503.el7.centos.2.8                base
+cpp.x86_64                         4.8.3-9.el7                            base
+cronie.x86_64                      1.4.11-13.el7                          base
+cronie-anacron.x86_64              1.4.11-13.el7                          base
+cryptsetup-libs.x86_64             1.6.6-3.el7                            base
+dbus.x86_64                        1:1.6.12-11.el7                        base
+dbus-libs.x86_64                   1:1.6.12-11.el7                        base
+device-mapper.x86_64               7:1.02.93-3.el7                        base
+device-mapper-event.x86_64         7:1.02.93-3.el7                        base
+device-mapper-event-libs.x86_64    7:1.02.93-3.el7                        base
+device-mapper-libs.x86_64          7:1.02.93-3.el7                        base
+Random plugin output
+Loaded plugins: fastestmirror, product-id, fake-plugin
+Random plugin failed, is the mirror available?

data/spec/integration/indirector/file_content/file_server_spec.rb

@@ -57,6 +57,23 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
     expect(result.content).to eq("1\r\n")
   end
 
+  it "should find file content of tasks in modules" do
+    path = tmpfile("task_file_content")
+    Dir.mkdir(path)
+
+    modpath = File.join(path, "myothermod")
+    FileUtils.mkdir_p(File.join(modpath, "tasks"))
+    file = File.join(modpath, "tasks", "mytask")
+    File.open(file, "wb") { |f| f.write "I'm a task" }
+
+    env = Puppet::Node::Environment.create(:foo, [path])
+    result = Puppet::FileServing::Content.indirection.find("tasks/myothermod/mytask", :environment => env)
+
+    expect(result).not_to be_nil
+    expect(result).to be_instance_of(Puppet::FileServing::Content)
+    expect(result.content).to eq("I'm a task")
+  end
+
   it "should find file content in files when node name expansions are used" do
     Puppet::FileSystem.stubs(:exist?).returns true
     Puppet::FileSystem.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)

data/spec/integration/indirector/file_metadata/file_server_spec.rb

@@ -42,6 +42,16 @@ describe Puppet::Indirector::FileMetadata::FileServer, " when finding files" do
     end
   end
 
+  describe "that are tasks in modules" do
+    with_checksum_types("task_file_content", "mymod/tasks/mytask") do
+      it "should return the correct metadata" do
+        env = Puppet::Node::Environment.create(:foo, [env_path])
+        result = Puppet::FileServing::Metadata.indirection.find("tasks/mymod/mytask", :environment => env, :checksum_type => checksum_type)
+        expect_correct_checksum(result, checksum_type, checksum, Puppet::FileServing::Metadata)
+      end
+    end
+  end
+
   describe "when node name expansions are used" do
     with_checksum_types("file_server_testing", "mynode/myfile") do
       it "should return the correct metadata" do

data/spec/integration/util/windows/process_spec.rb

@@ -34,6 +34,51 @@ describe "Puppet::Util::Windows::Process", :if => Puppet.features.microsoft_wind
     end
   end
 
+  describe "when reading environment variables" do
+    after :each do
+      # spec\integration\test\test_helper_spec.rb calls set_environment_strings
+      # after :all and thus needs access to the real APIs once again
+      Puppet::Util::Windows::Process.unstub(:GetEnvironmentStringsW)
+      Puppet::Util::Windows::Process.unstub(:FreeEnvironmentStringsW)
+    end
+
+    it "will ignore only keys or values with corrupt byte sequences" do
+      arraydest = []
+      Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(arraydest))
+
+      env_vars = {}
+
+      # Create a UTF-16LE version of the below null separated environment string
+      # "a=b\x00c=d\x00e=\xDD\xDD\x00f=g\x00\x00"
+      env_var_block =
+        "a=b\x00".encode(Encoding::UTF_16LE) +
+        "c=d\x00".encode(Encoding::UTF_16LE) +
+        'e='.encode(Encoding::UTF_16LE) + "\xDD\xDD".force_encoding(Encoding::UTF_16LE) + "\x00".encode(Encoding::UTF_16LE) +
+        "f=g\x00\x00".encode(Encoding::UTF_16LE)
+
+      env_var_block_bytes = env_var_block.bytes.to_a
+
+      FFI::MemoryPointer.new(:byte, env_var_block_bytes.count) do |ptr|
+        # uchar here is synonymous with byte
+        ptr.put_array_of_uchar(0, env_var_block_bytes)
+
+        # stub the block of memory that the Win32 API would typically return via pointer
+        Puppet::Util::Windows::Process.expects(:GetEnvironmentStringsW).returns(ptr)
+        # stub out the real API call to free memory, else process crashes
+        Puppet::Util::Windows::Process.expects(:FreeEnvironmentStringsW)
+
+        env_vars = Puppet::Util::Windows::Process.get_environment_strings
+      end
+
+      # based on corrupted memory, the e=\xDD\xDD should have been removed from the set
+      expect(env_vars).to eq({'a' => 'b', 'c' => 'd', 'f' => 'g'})
+
+      # and Puppet should emit a warning about it
+      expect(arraydest.last.level).to eq(:warning)
+      expect(arraydest.last.message).to eq("Discarding environment variable e=\uFFFD which contains invalid bytes")
+    end
+  end
+
   describe "when setting environment variables" do
     it "can properly handle env var values with = in them" do
       begin

data/spec/lib/puppet_spec/modules.rb

@@ -20,6 +20,16 @@ module PuppetSpec::Modules
         end
       end
 
+      if tasks = options[:tasks]
+        tasks_dir = File.join(module_dir, 'tasks')
+        FileUtils.mkdir_p(tasks_dir)
+        tasks.each do |task_files|
+          task_files.each do |task_file|
+            FileUtils.touch(File.join(tasks_dir, task_file))
+          end
+        end
+      end
+
       Puppet::Module.new(name, module_dir, environment)
     end
 

data/spec/shared_contexts/types_setup.rb

@@ -93,6 +93,7 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PFloatType,
       Puppet::Pops::Types::PBooleanType,
       Puppet::Pops::Types::PEnumType,
+      Puppet::Pops::Types::PPatternType,
     ]
   end
   def scalar_data_types
@@ -161,18 +162,32 @@ shared_context 'types_setup' do
   end
 
   def self.data_compatible_types
+    tf = Puppet::Pops::Types::TypeFactory
     result = scalar_data_types
-    result << Puppet::Pops::Types::PArrayType.new(Puppet::Pops::Types::PScalarDataType::DEFAULT)
-    result << Puppet::Pops::Types::PHashType.new(Puppet::Pops::Types::PStringType::DEFAULT, Puppet::Pops::Types::PScalarDataType::DEFAULT)
+    result << Puppet::Pops::Types::PArrayType.new(tf.data)
+    result << Puppet::Pops::Types::PHashType.new(Puppet::Pops::Types::PStringType::DEFAULT, tf.data)
     result << Puppet::Pops::Types::PUndefType
-    result << Puppet::Pops::Types::PNotUndefType.new(Puppet::Pops::Types::PScalarDataType::DEFAULT)
-    result << Puppet::Pops::Types::PTupleType.new([Puppet::Pops::Types::PScalarDataType::DEFAULT])
+    result << Puppet::Pops::Types::PTupleType.new([tf.data])
     result
   end
   def data_compatible_types
     self.class.data_compatible_types
   end
 
+  def self.rich_data_compatible_types
+    tf = Puppet::Pops::Types::TypeFactory
+    result = scalar_types
+    result << Puppet::Pops::Types::PArrayType.new(tf.rich_data)
+    result << Puppet::Pops::Types::PHashType.new(tf.rich_data_key, tf.rich_data)
+    result << Puppet::Pops::Types::PUndefType
+    result << Puppet::Pops::Types::PDefaultType
+    result << Puppet::Pops::Types::PTupleType.new([tf.rich_data])
+    result
+  end
+  def rich_data_compatible_types
+    self.class.rich_data_compatible_types
+  end
+
   def self.type_from_class(c)
     c.is_a?(Class) ? c::DEFAULT : c
   end

data/spec/spec_helper.rb

@@ -8,19 +8,18 @@ $LOAD_PATH.unshift File.join(dir, 'lib')
 # Don't want puppet getting the command line arguments for rake or autotest
 ARGV.clear
 
-# Stub out gettext's `_` method, which attempts to load translations.
-# Several of our mocks (mostly around file system interaction) are broken by
-# FastGettext's implementation of this method.
-def _(msg)
-  msg
-end
-
 begin
   require 'rubygems'
 rescue LoadError
 end
 
 require 'puppet'
+
+# Stub out gettext's `_` and `n_()` methods, which attempt to load translations.
+# Several of our mocks (mostly around file system interaction) are broken by
+# FastGettext's implementation of these methods.
+require 'puppet/gettext/stubs'
+
 gem 'rspec', '>=3.1.0'
 require 'rspec/expectations'
 require 'rspec/its'

data/spec/unit/face/help_spec.rb

@@ -103,13 +103,13 @@ describe Puppet::Face[:help, '0.0.1'] do
     end
 
     it "returns an 'unavailable' summary if the 'agent' application fails to generate help" do
-      Puppet::Application['agent'].class.any_instance.stubs(:help).raises(ArgumentError, "whoops")
+      Puppet::Application['agent'].class.any_instance.stubs(:summary).raises(ArgumentError, "whoops")
 
       expect(subject).to match(/agent\s+! Subcommand unavailable due to error\. Check error logs\./)
     end
 
     it "returns an 'unavailable' summary if the legacy application raises a LoadError" do
-      Puppet::Application['agent'].class.any_instance.stubs(:help).raises(LoadError, "cannot load such file -- yard")
+      Puppet::Application['agent'].class.any_instance.stubs(:summary).raises(LoadError, "cannot load such file -- yard")
 
       expect(subject).to match(/agent\s+! Subcommand unavailable due to error\. Check error logs\./)
     end

data/spec/unit/file_serving/configuration_spec.rb

@@ -83,14 +83,15 @@ describe Puppet::FileServing::Configuration do
       expect(config.mounted?("one")).to be_truthy
     end
 
-    it "should add modules and plugins mounts even if the file does not exist" do
+    it "should add modules, plugins, and tasks mounts even if the file does not exist" do
       Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("modules")).to be_truthy
       expect(config.mounted?("plugins")).to be_truthy
+      expect(config.mounted?("tasks")).to be_truthy
     end
 
-    it "should allow all access to modules and plugins if no fileserver.conf exists" do
+    it "should allow all access to modules, plugins, and tasks if no fileserver.conf exists" do
       Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
       modules = stub 'modules', :empty? => true
       Puppet::FileServing::Mount::Modules.stubs(:new).returns(modules)
@@ -100,10 +101,14 @@ describe Puppet::FileServing::Configuration do
       Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
       plugins.expects(:allow).with('*')
 
+      tasks = stub 'tasks', :empty? => true
+      Puppet::FileServing::Mount::Tasks.stubs(:new).returns(tasks)
+      tasks.expects(:allow).with('*')
+
       Puppet::FileServing::Configuration.configuration
     end
 
-    it "should not allow access from all to modules and plugins if the fileserver.conf provided some rules" do
+    it "should not allow access from all to modules, plugins, and tasks if the fileserver.conf provided some rules" do
       Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
 
       modules = stub 'modules', :empty? => false
@@ -114,15 +119,20 @@ describe Puppet::FileServing::Configuration do
       Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
       plugins.expects(:allow).with('*').never
 
+      tasks = stub 'tasks', :empty? => false
+      Puppet::FileServing::Mount::Tasks.stubs(:new).returns(tasks)
+      tasks.expects(:allow).with('*').never
+
       Puppet::FileServing::Configuration.configuration
     end
 
-    it "should add modules and plugins mounts even if they are not returned by the parser" do
+    it "should add modules, plugins, and tasks mounts even if they are not returned by the parser" do
       @parser.expects(:parse).returns("one" => mock("mount"))
       Puppet::FileSystem.expects(:exist?).returns true # the file doesn't exist
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("modules")).to be_truthy
       expect(config.mounted?("plugins")).to be_truthy
+      expect(config.mounted?("tasks")).to be_truthy
     end
   end
 

data/spec/unit/file_serving/mount/modules_spec.rb

@@ -41,7 +41,7 @@ describe Puppet::FileServing::Mount::Modules do
 
   describe "when searching for files" do
     it "should fail if no module is specified" do
-      expect { @mount.find("", @request) }.to raise_error(/No module specified/)
+      expect { @mount.search("", @request) }.to raise_error(/No module specified/)
     end
 
     it "should use the node's environment to search the module" do

data/spec/unit/file_serving/mount/tasks_spec.rb

@@ -0,0 +1,72 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/file_serving/mount/tasks'
+
+describe Puppet::FileServing::Mount::Tasks do
+  before do
+    @mount = Puppet::FileServing::Mount::Tasks.new("tasks")
+
+    @environment = stub 'environment', :module => nil
+    @request = stub 'request', :environment => @environment
+  end
+
+  describe "when finding task files" do
+    it "should fail if no task is specified" do
+      expect { @mount.find("", @request) }.to raise_error(/No task specified/)
+    end
+
+    it "should use the request's environment to find the module" do
+      mod_name = 'foo'
+      @environment.expects(:module).with(mod_name)
+
+      @mount.find(mod_name, @request)
+    end
+
+    it "should use the first segment of the request's path as the module name" do
+      @environment.expects(:module).with("foo")
+      @mount.find("foo/bartask", @request)
+    end
+
+    it "should return nil if the module in the path doesn't exist" do
+      @environment.expects(:module).with("foo").returns(nil)
+      expect(@mount.find("foo/bartask", @request)).to be_nil
+    end
+
+    it "should return the file path from the module" do
+      mod = mock('module')
+      mod.expects(:task_file).with("bartask").returns("mocked")
+      @environment.expects(:module).with("foo").returns(mod)
+      expect(@mount.find("foo/bartask", @request)).to eq("mocked")
+    end
+  end
+
+  describe "when searching for task files" do
+    it "should fail if no module is specified" do
+      expect { @mount.search("", @request) }.to raise_error(/No task specified/)
+    end
+
+    it "should use the request's environment to find the module" do
+      mod_name = 'foo'
+      @environment.expects(:module).with(mod_name)
+
+      @mount.search(mod_name, @request)
+    end
+
+    it "should use the first segment of the request's path as the module name" do
+      @environment.expects(:module).with("foo")
+      @mount.search("foo/bartask", @request)
+    end
+
+    it "should return nil if the module in the path doesn't exist" do
+      @environment.expects(:module).with("foo").returns(nil)
+      expect(@mount.search("foo/bartask", @request)).to be_nil
+    end
+
+    it "should return the file path from the module" do
+      mod = mock('module')
+      mod.expects(:task_file).with("bartask").returns("mocked")
+      @environment.expects(:module).with("foo").returns(mod)
+      expect(@mount.search("foo/bartask", @request)).to eq(["mocked"])
+    end
+  end
+end

data/spec/unit/functions/epp_spec.rb

@@ -17,6 +17,11 @@ describe "the epp function" do
       expect(eval_template("<%= $kryptonite == undef %>")).to eq("true")
     end
 
+    it "gets error accessing a variable that is malformed" do
+      expect { eval_template("<%= $kryptonite::USER %>")}.to raise_error(
+        /Illegal variable name, The given name 'kryptonite::USER' does not conform to the naming rule/)
+    end
+
     it "get nil accessing a variable that is undef" do
       scope['undef_var'] = nil
       expect(eval_template("<%= $undef_var == undef %>")).to eq("true")

data/spec/unit/functions/regsubst_spec.rb

@@ -30,7 +30,7 @@ describe 'the regsubst function' do
     end
 
     it 'should raise an Error if given a bad flag' do
-      expect { regsubst('foo', 'bar', 'gazonk', 'X') }.to raise_error(/parameter 'flags' expects a match for Pattern\[\/\^\[GEIM\]\*\$\/\], got 'X'/)
+      expect { regsubst('foo', 'bar', 'gazonk', 'X') }.to raise_error(/parameter 'flags' expects an undef value or a match for Pattern\[\/\^\[GEIM\]\*\$\/\], got 'X'/)
     end
 
     it 'should raise an Error if given a bad encoding' do

data/spec/unit/gettext_config_spec.rb

@@ -0,0 +1,57 @@
+require 'puppet/gettext/config'
+require 'spec_helper'
+
+describe Puppet::GettextConfig do
+  require 'puppet_spec/files'
+  include PuppetSpec::Files
+
+  let(:local_path) do
+    local_path ||= Puppet::GettextConfig::LOCAL_PATH
+  end
+
+  let(:windows_path) do
+    windows_path ||= Puppet::GettextConfig::WINDOWS_PATH
+  end
+
+  let(:posix_path) do
+    windows_path ||= Puppet::GettextConfig::POSIX_PATH
+  end
+
+  describe 'translation mode selection' do
+    it 'should select PO mode when given a local config path' do
+      expect(Puppet::GettextConfig.translation_mode(local_path)).to eq(:po)
+    end
+
+    it 'should select PO mode when given a non-package config path' do
+      expect(Puppet::GettextConfig.translation_mode('../fake/path')).to eq(:po)
+    end
+
+    it 'should select MO mode when given a Windows package config path' do
+      expect(Puppet::GettextConfig.translation_mode(windows_path)).to eq(:mo)
+    end
+
+    it 'should select MO mode when given a POSIX package config path' do
+      expect(Puppet::GettextConfig.translation_mode(posix_path)).to eq(:mo)
+    end
+  end
+
+  describe 'initialization' do
+    context 'when given a nil config path' do
+      it 'should return false' do
+        expect(Puppet::GettextConfig.initialize(nil, :po)).to be false
+      end
+    end
+
+    context 'when given a valid config file location' do
+      it 'should return true' do
+        expect(Puppet::GettextConfig.initialize(local_path, :po)).to be true
+      end
+    end
+
+    context 'when given a bad file format' do
+      it 'should raise an exception' do
+        expect { Puppet::GettextConfig.initialize(local_path, :bad_format) }.to raise_error(Puppet::Error)
+      end
+    end
+  end
+end