puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

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

@@ -49,8 +49,7 @@ describe provider_class do
       @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
       @provider.stubs(:zypper_version).returns "1.2.8"
 
-      @provider.expects(:zypper).with('--quiet', :install,
-        '--auto-agree-with-licenses', '--no-confirm', nil, 'mypackage-1.2.3-4.5.6')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage-1.2.3-4.5.6')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -58,8 +57,7 @@ describe provider_class do
     it "should use a command-line without versioned package" do
       @resource.stubs(:should).with(:ensure).returns :latest
       @provider.stubs(:zypper_version).returns "1.2.8"
-      @provider.expects(:zypper).with('--quiet', :install,
-        '--auto-agree-with-licenses', '--no-confirm', nil, 'mypackage')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -70,8 +68,7 @@ describe provider_class do
       @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
       @provider.stubs(:zypper_version).returns "0.6.104"
 
-      @provider.expects(:zypper).with('--terse', :install,
-        '--auto-agree-with-licenses', '--no-confirm', nil, 'mypackage-1.2.3-4.5.6')
+      @provider.expects(:zypper).with('--terse', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage-1.2.3-4.5.6')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -79,8 +76,7 @@ describe provider_class do
     it "should use a command-line without versioned package" do
       @resource.stubs(:should).with(:ensure).returns :latest
       @provider.stubs(:zypper_version).returns "0.6.104"
-      @provider.expects(:zypper).with('--terse', :install,
-        '--auto-agree-with-licenses', '--no-confirm', nil, 'mypackage')
+      @provider.expects(:zypper).with('--terse', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -91,8 +87,7 @@ describe provider_class do
       @resource.stubs(:should).with(:ensure).returns "1.2.3-4.5.6"
       @provider.stubs(:zypper_version).returns "0.6.13"
 
-      @provider.expects(:zypper).with('--terse', :install,
-        '--no-confirm', nil, 'mypackage-1.2.3-4.5.6')
+      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage-1.2.3-4.5.6')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -100,8 +95,7 @@ describe provider_class do
     it "should use a command-line without versioned package" do
       @resource.stubs(:should).with(:ensure).returns :latest
       @provider.stubs(:zypper_version).returns "0.6.13"
-      @provider.expects(:zypper).with('--terse', :install,
-        '--no-confirm', nil, 'mypackage')
+      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -127,15 +121,47 @@ describe provider_class do
   describe "when installing with zypper install options" do
     it "should install the package without checking keys" do
       @resource.stubs(:[]).with(:name).returns "php5"
-      @resource.stubs(:should).with(:install_options).returns ['--no-gpg-check', {'-p' => '/vagrant/files/localrepo/'}]
+      @resource.stubs(:[]).with(:install_options).returns ['--no-gpg-check', {'-p' => '/vagrant/files/localrepo/'}]
       @resource.stubs(:should).with(:ensure).returns "5.4.10-4.5.6"
       @provider.stubs(:zypper_version).returns "1.2.8"
 
-      @provider.expects(:install_options).returns "--no-gpg-check -p \"/vagrant/files/localrepo/\""
       @provider.expects(:zypper).with('--quiet', :install,
-        '--auto-agree-with-licenses', '--no-confirm', '--no-gpg-check -p "/vagrant/files/localrepo/"', 'php5-5.4.10-4.5.6')
+        '--auto-agree-with-licenses', '--no-confirm', '--no-gpg-check', '-p=/vagrant/files/localrepo/', 'php5-5.4.10-4.5.6')
       @provider.expects(:query).returns "php5 0 5.4.10 4.5.6 x86_64"
       @provider.install
     end
+
+    it "should install package with hash install options" do
+      @resource.stubs(:[]).with(:name).returns 'vim'
+      @resource.stubs(:[]).with(:install_options).returns([{ '--a' => 'foo', '--b' => '"quoted bar"' }])
+      @resource.stubs(:should).with(:ensure).returns :present
+
+      @provider.stubs(:zypper_version).returns '1.2.8'
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a=foo', '--b="quoted bar"', 'vim')
+      @provider.expects(:query).returns 'package vim is not installed'
+      @provider.install
+    end
+
+    it "should install package with array install options" do
+      @resource.stubs(:[]).with(:name).returns 'vim'
+      @resource.stubs(:[]).with(:install_options).returns([['--a', '--b', '--c']])
+      @resource.stubs(:should).with(:ensure).returns :present
+
+      @provider.stubs(:zypper_version).returns '1.2.8'
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a', '--b', '--c', 'vim')
+      @provider.expects(:query).returns 'package vim is not installed'
+      @provider.install
+    end
+
+    it "should install package with string install options" do
+      @resource.stubs(:[]).with(:name).returns 'vim'
+      @resource.stubs(:[]).with(:install_options).returns(['--a --b --c'])
+      @resource.stubs(:should).with(:ensure).returns :present
+
+      @provider.stubs(:zypper_version).returns '1.2.8'
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a --b --c', 'vim')
+      @provider.expects(:query).returns 'package vim is not installed'
+      @provider.install
+    end
   end
 end

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

@@ -14,11 +14,11 @@ describe provider_class do
 
   let :rcscripts do
     [
-     'apmd',
-     'aucat',
-     'cron',
-     'puppetd'
-   ]
+      '/etc/rc.d/apmd',
+      '/etc/rc.d/aucat',
+      '/etc/rc.d/cron',
+      '/etc/rc.d/puppetd'
+    ]
   end
 
   describe "#instances" do
@@ -27,11 +27,11 @@ describe provider_class do
     end
 
     it "should list all available services" do
-      FileTest.expects(:directory?).with('/etc/rc.d').returns true
-      Dir.expects(:entries).with('/etc/rc.d').returns rcscripts
+      File.expects(:directory?).with('/etc/rc.d').returns true
+      Dir.expects(:glob).with('/etc/rc.d/*').returns rcscripts
 
       rcscripts.each do |script|
-        FileTest.expects(:executable?).with("/etc/rc.d/#{script}").returns true
+        File.expects(:executable?).with(script).returns true
       end
 
       described_class.instances.map(&:name).should == [
@@ -81,21 +81,21 @@ describe provider_class do
       provider.status
     end
 
-      it "should return :stopped when status command returns with a non-zero exitcode" do
-        provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
-        provider.expects(:execute).with(['/etc/rc.d/sshd', :status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).never
-        provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
-        $CHILD_STATUS.stubs(:exitstatus).returns 3
-        provider.status.should == :stopped
-      end
+    it "should return :stopped when status command returns with a non-zero exitcode" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
+      provider.expects(:execute).with(['/etc/rc.d/sshd', :status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).never
+      provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
+      $CHILD_STATUS.stubs(:exitstatus).returns 3
+      provider.status.should == :stopped
+    end
 
-      it "should return :running when status command returns with a zero exitcode" do
-        provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
-        provider.expects(:execute).with(['/etc/rc.d/sshd', :status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).never
-        provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
-        $CHILD_STATUS.stubs(:exitstatus).returns 0
-        provider.status.should == :running
-      end
+    it "should return :running when status command returns with a zero exitcode" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
+      provider.expects(:execute).with(['/etc/rc.d/sshd', :status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).never
+      provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
+      $CHILD_STATUS.stubs(:exitstatus).returns 0
+      provider.status.should == :running
+    end
   end
 
   describe "#restart" do
@@ -122,4 +122,111 @@ describe provider_class do
       provider.restart
     end
   end
+
+  describe "#parse_rc_line" do
+    it "can parse a flag line with a known value" do
+      output = described_class.parse_rc_line('daemon_flags=')
+      output.should eq('')
+    end
+
+    it "can parse a flag line with a flag is wrapped in single quotes" do
+      output = described_class.parse_rc_line('daemon_flags=\'\'')
+      output.should eq('\'\'')
+    end
+
+    it "can parse a flag line with a flag is wrapped in double quotes" do
+      output = described_class.parse_rc_line('daemon_flags=""')
+      output.should eq('')
+    end
+
+    it "can parse a flag line with a trailing comment" do
+      output = described_class.parse_rc_line('daemon_flags="-d" # bees')
+      output.should eq('-d')
+    end
+
+    it "can parse a flag line with a bare word" do
+      output = described_class.parse_rc_line('daemon_flags=YES')
+      output.should eq('YES')
+    end
+
+    it "can parse a flag line with a flag that contains an equals" do
+      output = described_class.parse_rc_line('daemon_flags="-Dbla -tmpdir=foo"')
+      output.should eq('-Dbla -tmpdir=foo')
+    end
+  end
+
+  describe "#pkg_scripts" do
+    it "can retrieve the package_scripts array from rc.conf.local" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.expects(:load_rcconf_local_array).returns ['pkg_scripts="dbus_daemon cupsd"']
+      expect(provider.pkg_scripts).to match_array(['dbus_daemon', 'cupsd'])
+    end
+
+    it "returns an empty array when no pkg_scripts line is found" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.expects(:load_rcconf_local_array).returns ["#\n#\n#"]
+      expect(provider.pkg_scripts).to match_array([])
+    end
+  end
+
+  describe "#pkg_scripts_append" do
+    it "can append to the package_scripts array and return the result" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.expects(:load_rcconf_local_array).returns ['pkg_scripts="dbus_daemon"']
+      expect(provider.pkg_scripts_append).to match_array(['dbus_daemon', 'cupsd'])
+    end
+
+    it "should not duplicate the script name" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.expects(:load_rcconf_local_array).returns ['pkg_scripts="cupsd dbus_daemon"']
+      expect(provider.pkg_scripts_append).to match_array(['dbus_daemon', 'cupsd'])
+    end
+  end
+
+  describe "#pkg_scripts_remove" do
+    it "can append to the package_scripts array and return the result" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.expects(:load_rcconf_local_array).returns ['pkg_scripts="dbus_daemon cupsd"']
+      expect(provider.pkg_scripts_remove).to match_array(['dbus_daemon'])
+    end
+
+    it "should not remove the script from the array unless its needed" do
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.expects(:load_rcconf_local_array).returns ['pkg_scripts="dbus_daemon"']
+      expect(provider.pkg_scripts_remove).to match_array(['dbus_daemon'])
+    end
+  end
+
+  describe "#set_content_flags" do
+    it "can create the necessary content where none is provided" do
+      content = []
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.set_content_flags(content,'-d').should match_array(['cupsd_flags="-d"'])
+    end
+
+    it "can modify the existing content" do
+      content = ['cupsd_flags="-f"']
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      output = provider.set_content_flags(content,"-d")
+      output.should match_array(['cupsd_flags="-d"'])
+    end
+  end
+
+  describe "#remove_content_flags" do
+    it "can remove the flags line from the requested content" do
+      content = ['cupsd_flags="-d"']
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      output = provider.remove_content_flags(content)
+      output.should_not match_array(['cupsd_flags="-d"'])
+    end
+  end
+
+  describe "#set_content_scripts" do
+    it "should append to the list of scripts" do
+      content = ['pkg_scripts="dbus_daemon"']
+      scripts = ['dbus_daemon','cupsd']
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.set_content_scripts(content,scripts).should match_array(['pkg_scripts="dbus_daemon cupsd"'])
+    end
+  end
 end

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

@@ -69,11 +69,25 @@ describe provider_class, :as_platform => :posix do
     @provider.should respond_to(:enabled?)
   end
 
-  it "should use --check on SuSE" do
-    Facter.expects(:value).with(:osfamily).returns 'Suse'
-    provider_class.expects(:chkconfig).with(@resource[:name], '--check')
+  describe "when checking enabled? on Suse" do
+    before :each do
+      Facter.expects(:value).with(:osfamily).returns 'Suse'
+    end
+
+    it "should check for on" do
+      provider_class.stubs(:chkconfig).with(@resource[:name]).returns "#{@resource[:name]}  on"
+      @provider.enabled?.should == :true
+    end
 
-    @provider.enabled?
+    it "should check for off" do
+      provider_class.stubs(:chkconfig).with(@resource[:name]).returns "#{@resource[:name]}  off"
+      @provider.enabled?.should == :false
+    end
+
+    it "should check for unknown service" do
+      provider_class.stubs(:chkconfig).with(@resource[:name]).returns "#{@resource[:name]}: unknown service"
+      @provider.enabled?.should == :false
+    end
   end
 
   it "should have an enable method" do

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

@@ -48,17 +48,13 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     end
 
     it "should return only services" do
-      described_class.expects(:systemctl).with('list-units', '--type', 'service', '--full', '--all', '--no-pager').returns File.read(my_fixture('list_units_services'))
+      described_class.expects(:systemctl).with('list-unit-files', '--type', 'service', '--full', '--all', '--no-pager').returns File.read(my_fixture('list_unit_files_services'))
       described_class.instances.map(&:name).should =~ %w{
+        arp-ethers.service
         auditd.service
-        crond.service
-        dbus.service
-        display-manager.service
-        ebtables.service
-        fedora-readonly.service
-        initrd-switch-root.service
-        ip6tables.service
-        puppet.service
+        autovt@.service
+        avahi-daemon.service
+        blk-availability.service
       }
     end
   end

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

@@ -50,7 +50,7 @@ describe Puppet::Type.type(:service).provider(:upstart) do
     end
 
     it "should not find excluded services" do
-      processes = "wait-for-state stop/waiting\nportmap-wait start/running"
+      processes = "wait-for-state stop/waiting\nportmap-wait start/running\nidmapd-mounting stop/waiting\nstartpar-bridge start/running"
       provider_class.stubs(:execpipe).yields(processes)
       provider_class.instances.should be_empty
     end

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

@@ -643,6 +643,11 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
         }]
     end
 
+    before :each do
+      # Ensure we don't have a value cached from another spec
+      provider.class.instance_variable_set(:@groups, nil) if provider.class.instance_variable_defined? :@groups
+    end
+
     it 'should return an array of hashes containing group data' do
       provider.class.expects(:dscl).with('-plist', '.', 'readall', '/Groups').returns(groups_xml)
       provider.class.get_list_of_groups.should == groups_hash
@@ -989,6 +994,11 @@ describe Puppet::Type.type(:user).provider(:directoryservice) do
   end
 
   describe 'self#get_os_version' do
+    before :each do
+      # Ensure we don't have a value cached from another spec
+      provider.class.instance_variable_set(:@os_version, nil) if provider.class.instance_variable_defined? :@os_version
+    end
+
     it 'should call Facter.value(:macosx_productversion_major) ONLY ONCE no matter how ' +
        'many times get_os_version() is called' do
       Facter.expects(:value).with(:macosx_productversion_major).once.returns('10.8')

data/spec/unit/provider/yumrepo/inifile_spec.rb

@@ -2,13 +2,77 @@ require 'spec_helper'
 
 describe Puppet::Type.type(:yumrepo).provider(:inifile) do
 
-  let(:virtual_inifile) { stub('virtual inifile') }
+  after(:each) do
+    described_class.clear
+  end
+
+  describe "enumerating all yum repo files" do
+    it "reads all files in the directories specified by reposdir" do
+      described_class.expects(:reposdir).returns ['/etc/yum.repos.d']
+
+      Dir.expects(:glob).with("/etc/yum.repos.d/*.repo").returns(['/etc/yum.repos.d/first.repo', '/etc/yum.repos.d/second.repo'])
+
+      actual = described_class.repofiles
+      expect(actual).to include("/etc/yum.repos.d/first.repo")
+      expect(actual).to include("/etc/yum.repos.d/second.repo")
+    end
+
+    it "includes '/etc/yum.conf' as the first element" do
+      described_class.expects(:reposdir).returns []
+
+      actual = described_class.repofiles
+      expect(actual[0]).to eq "/etc/yum.conf"
+    end
+  end
+
+  describe "generating the virtual inifile" do
+    let(:files) { ['/etc/yum.repos.d/first.repo', '/etc/yum.repos.d/second.repo', '/etc/yum.conf'] }
+    let(:collection) { mock('virtual inifile') }
+
+    before do
+      described_class.clear
+      Puppet::Util::IniConfig::FileCollection.expects(:new).returns collection
+    end
+
+    it "reads all files in the directories specified by self.repofiles" do
+      described_class.expects(:repofiles).returns(files)
+
+      files.each do |file|
+        Puppet::FileSystem.stubs(:file?).with(file).returns true
+        collection.expects(:read).with(file)
+      end
+      described_class.virtual_inifile
+    end
 
-  before :each do
-    described_class.stubs(:virtual_inifile).returns(virtual_inifile)
+    it "ignores repofile entries that are not files" do
+      described_class.expects(:repofiles).returns(files)
+
+      Puppet::FileSystem.stubs(:file?).with('/etc/yum.repos.d/first.repo').returns true
+      Puppet::FileSystem.stubs(:file?).with('/etc/yum.repos.d/second.repo').returns false
+      Puppet::FileSystem.stubs(:file?).with('/etc/yum.conf').returns true
+
+      collection.expects(:read).with('/etc/yum.repos.d/first.repo').once
+      collection.expects(:read).with('/etc/yum.repos.d/second.repo').never
+      collection.expects(:read).with('/etc/yum.conf').once
+      described_class.virtual_inifile
+    end
   end
 
-  describe 'self.instances' do
+  describe 'creating provider instances' do
+    let(:virtual_inifile) { stub('virtual inifile') }
+
+    before :each do
+      described_class.stubs(:virtual_inifile).returns(virtual_inifile)
+    end
+
+    let(:main_section) do
+      sect = Puppet::Util::IniConfig::Section.new('main', '/some/imaginary/file')
+      sect.entries << ['distroverpkg', 'centos-release']
+      sect.entries << ['plugins', '1']
+
+      sect
+    end
+
     let(:updates_section) do
       sect = Puppet::Util::IniConfig::Section.new('updates', '/some/imaginary/file')
       sect.entries << ['name', 'Some long description of the repo']
@@ -17,15 +81,65 @@ describe Puppet::Type.type(:yumrepo).provider(:inifile) do
       sect
     end
 
-    it 'finds any existing sections' do
-      virtual_inifile.expects(:each_section).yields(updates_section)
-      virtual_inifile.stubs(:[]).with('updates').returns(updates_section)
+    it "ignores the main section" do
+      virtual_inifile.expects(:each_section).multiple_yields(main_section, updates_section)
+
+      instances = described_class.instances
+      expect(instances).to have(1).items
+      expect(instances[0].name).to eq 'updates'
+    end
+
+    it "creates provider instances for every non-main section that was found" do
+      virtual_inifile.expects(:each_section).multiple_yields(main_section, updates_section)
 
-      providers = described_class.instances
-      providers.should have(1).items
-      providers[0].name.should == 'updates'
-      providers[0].descr.should == 'Some long description of the repo'
-      providers[0].enabled.should == '1'
+      sect = described_class.instances.first
+      expect(sect.name).to eq 'updates'
+      expect(sect.descr).to eq 'Some long description of the repo'
+      expect(sect.enabled).to eq '1'
+    end
+  end
+
+  describe "retrieving a section from the inifile" do
+
+    let(:collection) { stub('ini file collection') }
+
+    let(:ini_section) { stub('ini file section') }
+
+    before do
+      described_class.stubs(:virtual_inifile).returns(collection)
+    end
+
+    describe "and the requested section exists" do
+      before do
+        collection.stubs(:[]).with('updates').returns ini_section
+      end
+
+      it "returns the existing section" do
+        expect(described_class.section('updates')).to eq ini_section
+      end
+
+      it "doesn't create a new section" do
+        collection.expects(:add_section).never
+        described_class.section('updates')
+      end
+    end
+
+    describe "and the requested section doesn't exist" do
+      it "creates a section in the preferred repodir" do
+        described_class.stubs(:reposdir).returns ['/etc/yum.repos.d', '/etc/alternate.repos.d']
+        collection.expects(:[]).with('updates')
+        collection.expects(:add_section).with('updates', '/etc/alternate.repos.d/updates.repo')
+
+        described_class.section('updates')
+      end
+
+      it "creates a section in yum.conf if no repodirs exist" do
+        described_class.stubs(:reposdir).returns []
+        collection.expects(:[]).with('updates')
+        collection.expects(:add_section).with('updates', '/etc/yum.conf')
+
+        described_class.section('updates')
+      end
     end
   end
 
@@ -135,19 +249,61 @@ describe Puppet::Type.type(:yumrepo).provider(:inifile) do
       described_class.reposdir('/etc/yum.conf').should include("/etc/yum/extra.repos.d")
     end
 
-    it "doesn't the directory specified by the yum.conf 'reposdir' entry when the directory is absent" do
+    it "doesn't include the directory specified by the yum.conf 'reposdir' entry when the directory is absent" do
       Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(false)
 
       described_class.expects(:find_conf_value).with('reposdir', '/etc/yum.conf').returns "/etc/yum/extra.repos.d"
       described_class.reposdir('/etc/yum.conf').should_not include("/etc/yum/extra.repos.d")
     end
 
-    it "raises an entry if none of the specified repo directories exist" do
+    it "logs a warning and returns an empty array if none of the specified repo directories exist" do
       Puppet::FileSystem.unstub(:exist?)
       Puppet::FileSystem.stubs(:exist?).returns false
 
       described_class.stubs(:find_conf_value).with('reposdir', '/etc/yum.conf')
-      expect { described_class.reposdir('/etc/yum.conf') }.to raise_error('No yum directories were found on the local filesystem')
+      Puppet.expects(:debug).with('No yum directories were found on the local filesystem')
+      expect(described_class.reposdir('/etc/yum.conf')).to be_empty
+    end
+  end
+
+  describe "looking up a conf value" do
+    describe "and the file doesn't exist" do
+      it "returns nil" do
+        Puppet::FileSystem.stubs(:exist?).returns false
+        expect(described_class.find_conf_value('reposdir')).to be_nil
+      end
+    end
+
+    describe "and the file exists" do
+      let(:pfile) { stub('yum.conf physical file') }
+      let(:sect) { stub('ini section') }
+
+      before do
+        Puppet::FileSystem.stubs(:exist?).with('/etc/yum.conf').returns true
+        Puppet::Util::IniConfig::PhysicalFile.stubs(:new).with('/etc/yum.conf').returns pfile
+      end
+
+      it "creates a PhysicalFile to parse the given file" do
+        pfile.expects(:get_section)
+        described_class.find_conf_value('reposdir')
+      end
+
+      it "returns nil if the file exists but the 'main' section doesn't exist" do
+        pfile.expects(:get_section).with('main')
+        expect(described_class.find_conf_value('reposdir')).to be_nil
+      end
+
+      it "returns nil if the file exists but the INI property doesn't exist" do
+        pfile.expects(:get_section).with('main').returns sect
+        sect.expects(:[]).with('reposdir')
+        expect(described_class.find_conf_value('reposdir')).to be_nil
+      end
+
+      it "returns the value if the value is defined in the PhysicalFile" do
+        pfile.expects(:get_section).with('main').returns sect
+        sect.expects(:[]).with('reposdir').returns '/etc/alternate.repos.d'
+        expect(described_class.find_conf_value('reposdir')).to eq '/etc/alternate.repos.d'
+      end
     end
   end
 end