puppet 3.1.0.rc1 → 3.1.0.rc2

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

@@ -2,6 +2,7 @@
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:pip)
+osfamilies = { 'RedHat' => 'pip-python', 'Not RedHat' => 'pip' }
 
 describe provider_class do
 
@@ -30,19 +31,36 @@ describe provider_class do
 
   end
 
-  describe "instances" do
+  describe "cmd" do
+    it "should return pip-python on RedHat systems" do
+      Facter.stubs(:value).with(:osfamily).returns("RedHat")
+      provider_class.cmd.should == 'pip-python'
+    end
 
-    it "should return an array when pip is present" do
-      provider_class.expects(:which).with('pip').returns("/fake/bin/pip")
-      p = stub("process")
-      p.expects(:collect).yields("real_package==1.2.5")
-      provider_class.expects(:execpipe).with("/fake/bin/pip freeze").yields(p)
-      provider_class.instances
+    it "should return pip by default" do
+      Facter.stubs(:value).with(:osfamily).returns("Not RedHat")
+      provider_class.cmd.should == 'pip'
     end
 
-    it "should return an empty array when pip is missing" do
-      provider_class.expects(:which).with('pip').returns nil
-      provider_class.instances.should == []
+  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)
+        provider_class.expects(:which).with(pip_cmd).returns("/fake/bin/pip")
+        p = stub("process")
+        p.expects(:collect).yields("real_package==1.2.5")
+        provider_class.expects(:execpipe).with("/fake/bin/pip 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)
+        provider_class.expects(:which).with(pip_cmd).returns nil
+        provider_class.instances.should == []
+      end
     end
 
   end
@@ -179,23 +197,29 @@ describe provider_class do
       @provider.method(:lazy_pip).call "freeze"
     end
 
-    it "should retry if pip has not yet been found" do
-      @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
-      @provider.expects(:which).with('pip').returns("/fake/bin/pip")
-      @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)
+        @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
+        @provider.expects(:which).with(pip_cmd).returns("/fake/bin/pip")
+        @provider.method(:lazy_pip).call "freeze"
+      end
 
-    it "should fail if pip is missing" do
-      @provider.expects(:pip).with('freeze').raises(NoMethodError)
-      @provider.expects(:which).with('pip').returns(nil)
-      expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
-    end
+      it "should fail on #{osfamily} if #{pip_cmd} is missing" do
+        Facter.stubs(:value).with(:osfamily).returns(osfamily)
+        @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)
+        @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 command.')
+      end
 
-    it "should output a useful error message if pip is missing" do
-      @provider.expects(:pip).with('freeze').raises(NoMethodError)
-      @provider.expects(:which).with('pip').returns(nil)
-      expect { @provider.method(:lazy_pip).call("freeze") }.
-        to raise_error(NoMethodError, 'Could not locate the pip command.')
     end
 
   end

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

@@ -0,0 +1,65 @@
+#! /usr/bin/env ruby
+
+require 'spec_helper'
+
+provider = Puppet::Type.type(:package).provider(:portage)
+
+describe provider do
+  before do
+    packagename="sl"
+    @resource = stub('resource', :[] => packagename,:should => true)
+    @provider = provider.new(@resource)
+    
+    portage   = stub(:executable => "foo",:execute => true)
+    Puppet::Provider::CommandDefiner.stubs(:define).returns(portage)
+
+    @nomatch_result = ""
+    @match_result   = "app-misc sl [] [] http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html http://www.izumix.org.uk/sl/ sophisticated graphical program which corrects your miss typing\n"
+  end
+
+  it "is versionable" do
+    provider.should be_versionable
+  end
+
+  it "uses :emerge to install packages" do
+    @provider.expects(:emerge)
+    
+    @provider.install
+  end
+
+  it "uses query to find the latest package" do
+    @provider.expects(:query).returns({:versions_available => "myversion"})
+    
+    @provider.latest
+  end
+
+  it "uses eix to search the lastest version of a package" do
+    @provider.stubs(:update_eix)
+    @provider.expects(:eix).returns(StringIO.new(@match_result))
+    
+    @provider.query
+  end
+
+  it "eix arguments must not include --stable" do
+    @provider.class.eix_search_arguments.should_not include("--stable")
+  end
+
+  it "eix arguments must not include --exact" do
+    @provider.class.eix_search_arguments.should_not include("--exact")
+  end
+
+  it "query uses default arguments" do
+    @provider.stubs(:update_eix)
+    @provider.expects(:eix).returns(StringIO.new(@match_result))
+    @provider.class.expects(:eix_search_arguments).returns([])
+    
+    @provider.query
+  end
+
+  it "can handle search output with empty square brackets" do
+    @provider.stubs(:update_eix)
+    @provider.expects(:eix).returns(StringIO.new(@match_result))
+    
+    @provider.query[:name].should eq("sl")
+  end
+end

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

@@ -60,7 +60,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       provider.expects(:get_macosx_version_major).returns("10.6")
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => true}])
       provider.expects(:read_plist).returns({joblabel => {"Disabled" => false}})
-      provider.stubs(:launchd_overrides).returns(launchd_overrides)
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
       subject.enabled?.should == :true
     end
@@ -68,7 +67,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       provider.expects(:get_macosx_version_major).returns("10.6")
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
       provider.expects(:read_plist).returns({joblabel => {"Disabled" => true}})
-      provider.stubs(:launchd_overrides).returns(launchd_overrides)
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
       subject.enabled?.should == :false
     end
@@ -76,7 +74,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       provider.expects(:get_macosx_version_major).returns("10.6")
       subject.expects(:plist_from_label).returns([joblabel, {}])
       provider.expects(:read_plist).returns({})
-      provider.stubs(:launchd_overrides).returns(launchd_overrides)
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
       subject.enabled?.should == :true
     end
@@ -122,6 +119,12 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       subject.expects(:execute).with([:launchctl, :load, '-w', joblabel])
       subject.start
     end
+
+    it "(#16271) Should stop and start the service when a restart is called" do
+      subject.expects(:stop)
+      subject.expects(:start)
+      subject.restart
+    end
   end
 
   describe "when stopping the service" do
@@ -191,7 +194,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       resource[:enable] = true
       provider.expects(:get_macosx_version_major).returns("10.6")
       provider.expects(:read_plist).returns({})
-      provider.stubs(:launchd_overrides).returns(launchd_overrides)
       Plist::Emit.expects(:save_plist).once
       subject.enable
     end
@@ -202,7 +204,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       resource[:enable] = false
       provider.stubs(:get_macosx_version_major).returns("10.6")
       provider.stubs(:read_plist).returns({})
-      provider.stubs(:launchd_overrides).returns(launchd_overrides)
       Plist::Emit.expects(:save_plist).once
       subject.enable
     end

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

@@ -1,24 +1,52 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 require 'spec_helper'
+require 'etc'
 
 provider_class = Puppet::Type.type(:user).provider(:hpuxuseradd)
 
 describe provider_class do
-  # left from the useradd test... I have no clue what I'm doing.
-  before do
-    @resource = stub("resource", :name => "myuser", :managehome? => nil, :should => "fakeval", :[] => "fakeval")
-    @provider = provider_class.new(@resource)
+  let :resource do
+    Puppet::Type.type(:user).new(
+      :title => 'testuser',
+      :comment => 'Test J. User',
+      :provider => :hpuxuseradd
+    )
   end
+  let(:provider) { resource.provider }
 
   it "should add -F when modifying a user" do
-    @resource.expects(:allowdupe?).returns true
-    @provider.expects(:execute).with { |args| args.include?("-F") }
-    @provider.uid = 1000
+    resource.stubs(:allowdupe?).returns true
+    provider.expects(:execute).with { |args| args.include?("-F") }
+    provider.uid = 1000
   end
 
   it "should add -F when deleting a user" do
-    @provider.stubs(:exists?).returns(true)
-    @provider.expects(:execute).with { |args| args.include?("-F") }
-    @provider.delete
+    provider.stubs(:exists?).returns(true)
+    provider.expects(:execute).with { |args| args.include?("-F") }
+    provider.delete
+  end
+
+  context "managing passwords" do
+    let :pwent do
+      Struct::Passwd.new("testuser", "foopassword")
+    end
+
+    before :each do
+      Etc.stubs(:getpwent).returns(pwent)
+      Etc.stubs(:getpwnam).returns(pwent)
+    end
+
+    it "should have feature manages_passwords" do
+      provider_class.should be_manages_passwords
+    end
+
+    it "should return nil if user does not exist" do
+      Etc.stubs(:getpwent).returns(nil)
+      provider.password.must be_nil
+    end
+
+    it "should return password entry if exists" do
+      provider.password.must == "foopassword"
+    end
   end
 end

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

@@ -25,7 +25,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
     it "should add -o when allowdupe is enabled and the user is being created" do
       resource[:allowdupe] = true
-      provider.expects(:execute).with(['/usr/sbin/useradd', '-o', 'myuser'])
+      provider.expects(:execute).with(includes('-o'))
       provider.create
     end
 
@@ -33,7 +33,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       it "should add -r when system is enabled" do
         resource[:system] = :true
         provider.should be_system_users
-        provider.expects(:execute).with(['/usr/sbin/useradd', '-r', 'myuser'])
+        provider.expects(:execute).with(includes('-r'))
         provider.create
       end
     end
@@ -51,7 +51,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       described_class.has_feature :manages_password_age
       resource[:password_min_age] = 5
       resource[:password_max_age] = 10
-      provider.expects(:execute).with(['/usr/sbin/useradd', 'myuser'])
+      provider.expects(:execute).with(includes('/usr/sbin/useradd'))
       provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, 'myuser'])
       provider.create
     end
@@ -109,32 +109,32 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   end
 
   describe "#check_manage_home" do
-    it "should check manage home" do
-      resource.expects(:managehome?)
-      provider.check_manage_home
-    end
-
     it "should return an array with -m flag if home is managed" do
       resource[:managehome] = :true
-      provider.check_manage_home.must == ["-m"]
+      provider.expects(:execute).with(includes('-m'))
+      provider.create
     end
 
     it "should return an array with -r flag if home is managed" do
       resource[:managehome] = :true
       resource[:ensure] = :absent
-      provider.deletecmd.must == ['/usr/sbin/userdel', '-r', 'myuser']
+      provider.stubs(:exists?).returns(true)
+      provider.expects(:execute).with(includes('-r'))
+      provider.delete
     end
 
-    it "should return an array with -M if home is not managed and on Redhat" do
+    it "should use -M flag if home is not managed and on Redhat" do
       Facter.stubs(:value).with(:osfamily).returns("RedHat")
       resource[:managehome] = :false
-      provider.check_manage_home.must == ["-M"]
+      provider.expects(:execute).with(includes('-M'))
+      provider.create
     end
 
-    it "should return an empty array if home is not managed and not on Redhat" do
+    it "should not use -M flag if home is not managed and not on Redhat" do
       Facter.stubs(:value).with(:osfamily).returns("not RedHat")
       resource[:managehome] = :false
-      provider.check_manage_home.must == []
+      provider.expects(:execute).with(Not(includes('-M')))
+      provider.create
     end
   end
 

data/spec/unit/resource/type_spec.rb

@@ -8,7 +8,7 @@ describe Puppet::Resource::Type do
     Puppet::Resource::Type.new(:hostclass, "foo").name.should == "foo"
   end
 
-  [:code, :doc, :line, :file, :resource_type_collection].each do |attr|
+  [:code, :doc, :line, :file, :resource_type_collection, :ruby_code].each do |attr|
     it "should have a '#{attr}' attribute" do
       type = Puppet::Resource::Type.new(:hostclass, "foo")
       type.send(attr.to_s + "=", "yay")
@@ -16,22 +16,6 @@ describe Puppet::Resource::Type do
     end
   end
 
-  it "returns array when calling ruby_code" do
-    Puppet::Resource::Type.new(:hostclass, "foo").ruby_code.should be_an Array
-  end
-
-  it "assignment operator should append to ruby_code" do
-    type = Puppet::Resource::Type.new :hostclass, 'foo'
-    type.ruby_code << "code"
-    type.ruby_code << "more code"
-    type.ruby_code.should == ["code", "more code"]
-  end
-
-  it "has ruby_code attribute" do
-    type = Puppet::Resource::Type.new(:hostclass, "foo")
-    type.ruby_code.should == []
-  end
-
   [:hostclass, :node, :definition].each do |type|
     it "should know when it is a #{type}" do
       Puppet::Resource::Type.new(type, "foo").send("#{type}?").should be_true
@@ -467,10 +451,12 @@ describe Puppet::Resource::Type do
     end
 
     describe "and ruby code is provided" do
-      it "should evaluate ruby code" do
-        code = stub 'code'
-        code.expects(:evaluate).with {|scope, type_collection| scope.is_a? Puppet::Parser::Scope and type_collection.is_a? Puppet::Resource::TypeCollection }
-        @type.stubs(:ruby_code).returns(Array(code))
+      it "should create a DSL Resource API and evaluate it" do
+        @type.stubs(:ruby_code).returns(proc { "foo" })
+        @api = stub 'api'
+        Puppet::DSL::ResourceAPI.expects(:new).with { |res, scope, code| code == @type.ruby_code }.returns @api
+        @api.expects(:evaluate)
+
         @type.evaluate_code(@resource)
       end
     end
@@ -729,34 +715,6 @@ describe Puppet::Resource::Type do
       dest.doc.should == "foonessyayness"
     end
 
-    it "copies other's ruby code if it has no ruby code" do
-      dest   = Puppet::Resource::Type.new :hostclass, "bar"
-      source = Puppet::Resource::Type.new :hostclass, "foo"
-      source.ruby_code << "bar"
-
-      dest.merge source
-      dest.ruby_code.should == ["bar"]
-    end
-
-    it "appends other's ruby code if it has ruby code" do
-      dest   = Puppet::Resource::Type.new :hostclass, "bar"
-      source = Puppet::Resource::Type.new :hostclass, "foo"
-      dest.ruby_code   << "foo"
-      source.ruby_code << "bar"
-
-      dest.merge source
-      dest.ruby_code.should == ["foo", "bar"]
-    end
-
-    it "returns own ruby code if the other has no ruby code" do
-      dest   = Puppet::Resource::Type.new :hostclass, "bar", :ruby_code => "foo"
-      source = Puppet::Resource::Type.new :hostclass, "foo"
-      dest.ruby_code << "foo"
-
-      dest.merge source
-      dest.ruby_code.should == ["foo"]
-    end
-
     it "should turn its code into an ASTArray if necessary" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar", :code => code("foo"))
       source = Puppet::Resource::Type.new(:hostclass, "foo", :code => code("bar"))

data/spec/unit/resource_spec.rb

@@ -15,7 +15,6 @@ describe Puppet::Resource do
     end
   end
 
-
   it "should have a :title attribute" do
     Puppet::Resource.new(:user, "foo").title.should == "foo"
   end
@@ -306,33 +305,6 @@ describe Puppet::Resource do
       resource.set_default_parameters(@scope).should == ["a"]
     end
 
-    it "doesn't call safeevaluate on default value when it doesn't respond to safeevaluate" do
-      Puppet[:manifest] = "test.rb"
-      value = mock
-      value.stubs(:respond_to?).with(:safeevaluate).returns false
-      value.expects(:safeevaluate).never
-      Puppet::Node::Environment.new.known_resource_types.add(
-        Puppet::Resource::Type.new :definition, "default_param", :arguments => {"a" => value}
-      )
-
-      resource = Puppet::Parser::Resource.new "default_param", "name", :scope => Puppet::Parser::Scope.new(Puppet::Parser::Compiler.new(Puppet::Node.new("foo")))
-      resource.set_default_parameters @scope
-    end
-
-
-    it "calls safeevaluate on default when it responds to safeevaluate" do
-      value = mock
-      value.expects(:safeevaluate).returns 42
-      Puppet::Node::Environment.new.known_resource_types.add(
-        Puppet::Resource::Type.new :definition, "default_param", :arguments => {"a" => value}
-      )
-
-      resource = Puppet::Parser::Resource.new "default_param", "name", :scope => Puppet::Parser::Scope.new(Puppet::Parser::Compiler.new(Puppet::Node.new("foo")))
-      resource.set_default_parameters @scope
-    end
-
-
-
     describe "when the resource type is :hostclass" do
       let(:environment_name) { "testing env" }
       let(:fact_values) { { :a => 1 } }
@@ -993,8 +965,4 @@ type: File
       })
     end
   end
-
-  it "should be able to return canonical type name" do
-    Puppet::Resource.canonicalize_type("foo").should == "Foo"
-  end
 end