puppet 4.1.0 → 4.2.0

data/spec/unit/parser/scope_spec.rb

@@ -33,6 +33,15 @@ describe Puppet::Parser::Scope do
     end
   end
 
+  it "should generate a simple string when inspecting a scope" do
+    expect(@scope.inspect).to eq("Scope()")
+  end
+
+  it "should generate a simple string when inspecting a scope with a resource" do
+    @scope.resource="foo::bar"
+    expect(@scope.inspect).to eq("Scope(foo::bar)")
+  end
+
   it "should return a scope for use in a test harness" do
     expect(create_test_scope_for_node("node_name_foo")).to be_a_kind_of(Puppet::Parser::Scope)
   end

data/spec/unit/pops/evaluator/runtime3_converter_spec.rb

@@ -0,0 +1,19 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+
+require 'puppet/pops'
+require 'puppet/pops/types/type_factory'
+
+describe 'when converting to 3.x' do
+  it "converts a resource type starting with Class without confusing it with exact match on 'class'" do
+    t = Puppet::Pops::Types::TypeFactory.resource('classroom', 'kermit')
+    converted = Puppet::Pops::Evaluator::Runtime3Converter.instance.catalog_type_to_split_type_title(t)
+    expect(converted).to eql(['classroom', 'kermit'])
+  end
+
+  it "converts a resource type of exactly 'Class'" do
+    t = Puppet::Pops::Types::TypeFactory.resource('class', 'kermit')
+    converted = Puppet::Pops::Evaluator::Runtime3Converter.instance.catalog_type_to_split_type_title(t)
+    expect(converted).to eql(['class', 'kermit'])
+  end
+end

data/spec/unit/pops/evaluator/variables_spec.rb

@@ -41,7 +41,7 @@ describe 'Puppet::Pops::Impl::EvaluatorImpl' do
 
       it "access to global names works in local scope" do
         top_scope_block     = block( var('a').set(literal(2)+literal(2)))
-        local_scope_block   = block( var('a').set(var('::a')+literal(2)), var('::a'))
+        local_scope_block   = block( var('a').set(literal(100)), var('b').set(var('::a')+literal(2)), var('b'))
         expect(evaluate_l(top_scope_block, local_scope_block)).to eq(6)
       end
 

data/spec/unit/pops/parser/lexer2_spec.rb

@@ -524,7 +524,7 @@ describe 'Lexer2' do
       [:VARIABLE, "x"],
       :EQUALS,
       [:NUMBER, "10"],
-      [:RENDER_STRING, "just text\n"]
+      [:RENDER_STRING, "      just text\n"]
       )
     end
 
@@ -540,7 +540,39 @@ describe 'Lexer2' do
       [:VARIABLE, "x"],
       :EQUALS,
       [:NUMBER, "10"],
-      [:RENDER_STRING, "just text\n"]
+      [:RENDER_STRING, "      just text\n"]
+      )
+    end
+
+    it 'epp comments strips left whitespace when preceding is right trim' do
+      code = <<-CODE
+      This is <% $x=10 -%>
+      space-before-me-but-not-after   <%# This is an epp comment %>
+      just text
+      CODE
+      expect(epp_tokens_scanned_from(code)).to match_tokens2(
+      :EPP_START,
+      [:RENDER_STRING, "      This is "],
+      [:VARIABLE, "x"],
+      :EQUALS,
+      [:NUMBER, "10"],
+      [:RENDER_STRING, "      space-before-me-but-not-after\n      just text\n"]
+      )
+    end
+
+    it 'epp comments strips left whitespace on same line when preceding is not right trim' do
+      code = <<-CODE
+      This is <% $x=10 %>
+      <%# This is an epp comment -%>
+      just text
+      CODE
+      expect(epp_tokens_scanned_from(code)).to match_tokens2(
+      :EPP_START,
+      [:RENDER_STRING, "      This is "],
+      [:VARIABLE, "x"],
+      :EQUALS,
+      [:NUMBER, "10"],
+      [:RENDER_STRING, "\n      just text\n"]
       )
     end
 
@@ -555,7 +587,7 @@ describe 'Lexer2' do
       [:VARIABLE, "x"],
       :EQUALS,
       [:NUMBER, "10"],
-      [:RENDER_STRING, "<% this is escaped epp %>\n"]
+      [:RENDER_STRING, "      <% this is escaped epp %>\n"]
       )
     end
 

data/spec/unit/provider/augeas/augeas_spec.rb

@@ -692,6 +692,15 @@ describe provider_class do
       expect(@provider.execute_changes).to eq(:executed)
     end
 
+    it "should handle rename commands" do
+      @resource[:changes] = "rename Jar/Jar Binks"
+      @resource[:context] = "/foo/"
+      @augeas.expects(:rename).with("/foo/Jar/Jar", "Binks").returns(true)
+      @augeas.expects(:save).returns(true)
+      @augeas.expects(:close)
+      expect(@provider.execute_changes).to eq(:executed)
+    end
+
     it "should handle setm commands" do
       @resource[:changes] = ["set test[1]/Jar/Jar Foo","set test[2]/Jar/Jar Bar","setm test Jar/Jar Binks"]
       @resource[:context] = "/foo/"

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

@@ -35,11 +35,13 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
     let(:user1) { stub(:account => 'user1', :domain => '.', :to_s => 'user1sid') }
     let(:user2) { stub(:account => 'user2', :domain => '.', :to_s => 'user2sid') }
     let(:user3) { stub(:account => 'user3', :domain => '.', :to_s => 'user3sid') }
+    let(:invalid_user) { SecureRandom.uuid }
 
     before :each do
       Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user1').returns(user1)
       Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user2').returns(user2)
       Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user3').returns(user3)
+      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with(invalid_user).returns(nil)
     end
 
     describe "#members_insync?" do
@@ -157,6 +159,9 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
       it "should return a user string like DOMAIN\\USER,DOMAIN2\\USER2" do
         expect(provider.members_to_s(['user1', 'user2'])).to eq('.\user1,.\user2')
       end
+      it "should return the username when it cannot be resolved to a SID (for the sake of resource_harness error messages)" do
+        expect(provider.members_to_s([invalid_user])).to eq("#{invalid_user}")
+      end
     end
   end
 

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

@@ -24,9 +24,9 @@ describe Puppet::Type.type(:package).provider(:aptrpm) do
       pkg.provider.expects(:rpm).with(*args)
     end
 
-    it "should report absent packages" do
+    it "should report purged packages" do
       rpm.raises(Puppet::ExecutionFailure, "couldn't find rpm")
-      expect(pkg.property(:ensure).retrieve).to eq(:absent)
+      expect(pkg.property(:ensure).retrieve).to eq(:purged)
     end
 
     it "should report present packages correctly" do

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'puppet/provider/package'
+
+describe Puppet::Provider::Package do
+  it 'returns absent for uninstalled packages when not purgeable' do
+    provider = Puppet::Provider::Package.new
+    provider.expects(:query).returns nil
+    provider.class.expects(:feature?).with(:purgeable).returns false
+    expect(provider.properties[:ensure]).to eq(:absent)
+  end
+
+  it 'returns purged for uninstalled packages when purgeable' do
+    provider = Puppet::Provider::Package.new
+    provider.expects(:query).returns nil
+    provider.class.expects(:feature?).with(:purgeable).returns true
+    expect(provider.properties[:ensure]).to eq(:purged)
+  end
+end

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

@@ -185,6 +185,76 @@ context 'installing myresource' do
         end
       end
     end
+
+    describe 'insync?' do
+      describe 'for array of versions' do
+        let(:is) { ['1.3.4', '3.6.1', '5.1.2'] }
+
+        it 'returns true for ~> 1.3' do
+          resource[:ensure] = '~> 1.3'
+          expect(provider).to be_insync(is)
+        end
+
+        it 'returns false for ~> 2' do
+          resource[:ensure] = '~> 2'
+          expect(provider).to_not be_insync(is)
+        end
+
+        it 'returns true for > 4' do
+          resource[:ensure] = '> 4'
+          expect(provider).to be_insync(is)
+        end
+
+        it 'returns true for 3.6.1' do
+          resource[:ensure] = '3.6.1'
+          expect(provider).to be_insync(is)
+        end
+
+        it 'returns false for 3.6.2' do
+          resource[:ensure] = '3.6.2'
+          expect(provider).to_not be_insync(is)
+        end
+      end
+
+      describe 'for string version' do
+        let(:is) { '1.3.4' }
+
+        it 'returns true for ~> 1.3' do
+          resource[:ensure] = '~> 1.3'
+          expect(provider).to be_insync(is)
+        end
+
+        it 'returns false for ~> 2' do
+          resource[:ensure] = '~> 2'
+          expect(provider).to_not be_insync(is)
+        end
+
+        it 'returns false for > 4' do
+          resource[:ensure] = '> 4'
+          expect(provider).to_not be_insync(is)
+        end
+
+        it 'returns true for 1.3.4' do
+          resource[:ensure] = '1.3.4'
+          expect(provider).to be_insync(is)
+        end
+
+        it 'returns false for 3.6.1' do
+          resource[:ensure] = '3.6.1'
+          expect(provider).to_not be_insync(is)
+        end
+      end
+
+      it 'should return false for bad version specifiers' do
+        resource[:ensure] = 'not a valid gem specifier'
+        expect(provider).to_not be_insync('1.0')
+      end
+
+      it 'should return false for :absent' do
+        resource[:ensure] = '~> 1.0'
+        expect(provider).to_not be_insync(:absent)
+      end
+    end
   end
 end
 

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

@@ -410,4 +410,59 @@ EOF
       expect(provider.latest).to eq('package1 1.0.0, package2 1.0.1')
     end
   end
+
+  describe 'when determining if a resource is a group' do
+    before do
+      described_class.unstub(:group?)
+    end
+
+    it 'should return false on non-zero pacman exit' do
+      executor.stubs(:execute).with(['/usr/bin/pacman', '-Sg', 'git'], {:failonfail => true, :combine => true, :custom_environment => {}}).raises(Puppet::ExecutionFailure, 'error')
+      expect(described_class.group?('git')).to eq(false)
+    end
+
+    it 'should return false on empty pacman output' do
+      executor.stubs(:execute).with(['/usr/bin/pacman', '-Sg', 'git'], {:failonfail => true, :combine => true, :custom_environment => {}}).returns ''
+      expect(described_class.group?('git')).to eq(false)
+    end
+
+    it 'should return true on non-empty pacman output' do
+      executor.stubs(:execute).with(['/usr/bin/pacman', '-Sg', 'vim-plugins'], {:failonfail => true, :combine => true, :custom_environment => {}}).returns 'vim-plugins vim-a'
+      expect(described_class.group?('vim-plugins')).to eq(true)
+    end
+  end
+
+  describe 'when querying installed groups' do
+    let(:installed_packages) { {'package1' => '1.0', 'package2' => '2.0', 'package3' => '3.0'} }
+    let(:groups) { [['foo package1'], ['foo package2'], ['bar package3'], ['bar package4'], ['baz package5']] }
+
+    it 'should raise an error on non-zero pacman exit without a filter' do
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').returns 'error!'
+      $CHILD_STATUS.stubs(:exitstatus).returns 1
+      expect { described_class.get_installed_groups(installed_packages) }.to raise_error(Puppet::ExecutionFailure, 'error!')
+    end
+
+    it 'should return empty groups on non-zero pacman exit with a filter' do
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg git 2>&1').returns ''
+      $CHILD_STATUS.stubs(:exitstatus).returns 1
+      expect(described_class.get_installed_groups(installed_packages, 'git')).to eq({})
+    end
+
+    it 'should return empty groups on empty pacman output' do
+      pipe = stub()
+      pipe.expects(:each_line)
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').yields(pipe).returns ''
+      $CHILD_STATUS.stubs(:exitstatus).returns 0
+      expect(described_class.get_installed_groups(installed_packages)).to eq({})
+    end
+
+    it 'should return groups on non-empty pacman output' do
+      pipe = stub()
+      pipe.expects(:each_line).multiple_yields(*groups)
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').yields(pipe).returns ''
+      $CHILD_STATUS.stubs(:exitstatus).returns 0
+      expect(described_class.get_installed_groups(installed_packages)).to eq({'foo' => 'package1 1.0, package2 2.0'})
+    end
+  end
+
 end

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

@@ -0,0 +1,257 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:package).provider(:pip3)
+osfamilies = { ['All', nil] => 'pip3' }
+
+describe provider_class do
+
+  before do
+    @resource = Puppet::Resource.new(:package, "fake_package")
+    @provider = provider_class.new(@resource)
+    @client = stub_everything('client')
+    @client.stubs(:call).with('package_releases', 'real_package').returns(["1.3", "1.2.5", "1.2.4"])
+    @client.stubs(:call).with('package_releases', 'fake_package').returns([])
+    XMLRPC::Client.stubs(:new2).returns(@client)
+  end
+
+  describe "parse" do
+
+    it "should return a hash on valid input" do
+      expect(provider_class.parse("real_package==1.2.5")).to eq({
+        :ensure   => "1.2.5",
+        :name     => "real_package",
+        :provider => :pip3,
+      })
+    end
+
+    it "should return nil on invalid input" do
+      expect(provider_class.parse("foo")).to eq(nil)
+    end
+
+  end
+
+  describe "cmd" do
+
+    it "should return pip3 by default" do
+      Facter.stubs(:value).with(:osfamily).returns("Not RedHat")
+      expect(provider_class.cmd).to eq('pip3')
+    end
+
+  end
+
+  describe "instances" do
+
+    osfamilies.each do |osfamily, pip_cmd|
+      it "should return an array on #{osfamily} when #{pip_cmd} is present" do
+        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+        provider_class.expects(:which).with(pip_cmd).returns("/fake/bin/pip3")
+        p = stub("process")
+        p.expects(:collect).yields("real_package==1.2.5")
+        provider_class.expects(:execpipe).with("/fake/bin/pip3 freeze").yields(p)
+        provider_class.instances
+      end
+
+      it "should return an empty array on #{osfamily} when #{pip_cmd} is missing" do
+        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+        provider_class.expects(:which).with(pip_cmd).returns nil
+        expect(provider_class.instances).to eq([])
+      end
+    end
+
+  end
+
+  describe "query" do
+
+    before do
+      @resource[:name] = "real_package"
+    end
+
+    it "should return a hash when pip3 and the package are present" do
+      provider_class.expects(:instances).returns [provider_class.new({
+        :ensure   => "1.2.5",
+        :name     => "real_package",
+        :provider => :pip3,
+      })]
+
+      expect(@provider.query).to eq({
+        :ensure   => "1.2.5",
+        :name     => "real_package",
+        :provider => :pip3,
+      })
+    end
+
+    it "should return nil when the package is missing" do
+      provider_class.expects(:instances).returns []
+      expect(@provider.query).to eq(nil)
+    end
+
+    it "should be case insensitive" do
+      @resource[:name] = "Real_Package"
+
+      provider_class.expects(:instances).returns [provider_class.new({
+        :ensure   => "1.2.5",
+        :name     => "real_package",
+        :provider => :pip3,
+      })]
+
+      expect(@provider.query).to eq({
+        :ensure   => "1.2.5",
+        :name     => "real_package",
+        :provider => :pip3,
+      })
+    end
+
+  end
+
+  describe "latest" do
+
+    it "should find a version number for real_package" do
+      @resource[:name] = "real_package"
+      expect(@provider.latest).not_to eq(nil)
+    end
+
+    it "should not find a version number for fake_package" do
+      @resource[:name] = "fake_package"
+      expect(@provider.latest).to eq(nil)
+    end
+
+    it "should handle a timeout gracefully" do
+      @resource[:name] = "fake_package"
+      @client.stubs(:call).raises(Timeout::Error)
+      expect { @provider.latest }.to raise_error(Puppet::Error)
+    end
+
+  end
+
+  describe "install" do
+
+    before do
+      @resource[:name] = "fake_package"
+      @url = "git+https://example.com/fake_package.git"
+    end
+
+    it "should install" do
+      @resource[:ensure] = :installed
+      @resource[:source] = nil
+      @provider.expects(:lazy_pip).
+        with("install", '-q', "fake_package")
+      @provider.install
+    end
+
+    it "omits the -e flag (GH-1256)" do
+      # The -e flag makes the provider non-idempotent
+      @resource[:ensure] = :installed
+      @resource[:source] = @url
+      @provider.expects(:lazy_pip).with() do |*args|
+        not args.include?("-e")
+      end
+      @provider.install
+    end
+
+    it "should install from SCM" do
+      @resource[:ensure] = :installed
+      @resource[:source] = @url
+      @provider.expects(:lazy_pip).
+        with("install", '-q', "#{@url}#egg=fake_package")
+      @provider.install
+    end
+
+    it "should install a particular SCM revision" do
+      @resource[:ensure] = "0123456"
+      @resource[:source] = @url
+      @provider.expects(:lazy_pip).
+        with("install", "-q", "#{@url}@0123456#egg=fake_package")
+      @provider.install
+    end
+
+    it "should install a particular version" do
+      @resource[:ensure] = "0.0.0"
+      @resource[:source] = nil
+      @provider.expects(:lazy_pip).with("install", "-q", "fake_package==0.0.0")
+      @provider.install
+    end
+
+    it "should upgrade" do
+      @resource[:ensure] = :latest
+      @resource[:source] = nil
+      @provider.expects(:lazy_pip).
+        with("install", "-q", "--upgrade", "fake_package")
+      @provider.install
+    end
+
+    it "should handle install options" do
+      @resource[:ensure] = :installed
+      @resource[:source] = nil
+      @resource[:install_options] = [{"--timeout" => "10"}, "--no-index"]
+      @provider.expects(:lazy_pip).
+        with("install", "-q", "--timeout=10", "--no-index", "fake_package")
+      @provider.install
+    end
+
+  end
+
+  describe "uninstall" do
+
+    it "should uninstall" do
+      @resource[:name] = "fake_package"
+      @provider.expects(:lazy_pip).
+        with('uninstall', '-y', '-q', 'fake_package')
+      @provider.uninstall
+    end
+
+  end
+
+  describe "update" do
+
+    it "should just call install" do
+      @provider.expects(:install).returns(nil)
+      @provider.update
+    end
+
+  end
+
+  describe "lazy_pip" do
+
+    after(:each) do
+      Puppet::Type::Package::ProviderPip.instance_variable_set(:@confine_collection, nil)
+    end
+
+    it "should succeed if pip3 is present" do
+      @provider.stubs(:pip).returns(nil)
+      @provider.method(:lazy_pip).call "freeze"
+    end
+
+    osfamilies.each do |osfamily, pip_cmd|
+      it "should retry on #{osfamily} if #{pip_cmd} has not yet been found" do
+        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+        @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
+        @provider.expects(:which).with(pip_cmd).returns("/fake/bin/pip3")
+        @provider.method(:lazy_pip).call "freeze"
+      end
+
+      it "should fail on #{osfamily} if #{pip_cmd} is missing" do
+        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+        @provider.expects(:pip).with('freeze').raises(NoMethodError)
+        @provider.expects(:which).with(pip_cmd).returns(nil)
+        expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
+      end
+
+      it "should output a useful error message on #{osfamily} if #{pip_cmd} is missing" do
+        Facter.stubs(:value).with(:osfamily).returns(osfamily.first)
+        Facter.stubs(:value).with(:operatingsystemmajrelease).returns(osfamily.last)
+        @provider.expects(:pip).with('freeze').raises(NoMethodError)
+        @provider.expects(:which).with(pip_cmd).returns(nil)
+        expect { @provider.method(:lazy_pip).call("freeze") }.
+          to raise_error(NoMethodError, "Could not locate the #{pip_cmd} command.")
+      end
+
+    end
+
+  end
+
+end