puppet 2.7.3 → 2.7.4

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

@@ -0,0 +1,170 @@
+require 'spec_helper'
+
+describe 'Puppet::Provider::Package::Msi' do
+  include PuppetSpec::Files
+
+  before :each do
+    Puppet::Type.type(:package).stubs(:defaultprovider).returns(Puppet::Type.type(:package).provider(:msi))
+    Puppet[:vardir] = tmpdir('msi')
+    @state_dir = File.join(Puppet[:vardir], 'db', 'package', 'msi')
+  end
+
+  describe 'when installing' do
+    it 'should create a state file' do
+      resource = Puppet::Type.type(:package).new(
+        :name   => 'mysql-5.1.58-winx64',
+        :source => 'E:\mysql-5.1.58-winx64.msi'
+      )
+      resource.provider.stubs(:execute)
+      resource.provider.install
+
+      File.should be_exists File.join(@state_dir, 'mysql-5.1.58-winx64.yml')
+    end
+
+    it 'should use the install_options as parameter/value pairs' do
+      resource = Puppet::Type.type(:package).new(
+        :name            => 'mysql-5.1.58-winx64',
+        :source          => 'E:\mysql-5.1.58-winx64.msi',
+        :install_options => { 'INSTALLDIR' => 'C:\mysql-here' }
+      )
+
+      resource.provider.expects(:execute).with('msiexec.exe /qn /norestart /i E:\mysql-5.1.58-winx64.msi INSTALLDIR=C:\mysql-here')
+      resource.provider.install
+    end
+
+    it 'should only quote the value when an install_options value has a space in it' do
+      resource = Puppet::Type.type(:package).new(
+        :name            => 'mysql-5.1.58-winx64',
+        :source          => 'E:\mysql-5.1.58-winx64.msi',
+        :install_options => { 'INSTALLDIR' => 'C:\mysql here' }
+      )
+
+      resource.provider.expects(:execute).with('msiexec.exe /qn /norestart /i E:\mysql-5.1.58-winx64.msi INSTALLDIR="C:\mysql here"')
+      resource.provider.install
+    end
+
+    it 'should escape embedded quotes in install_options values with spaces' do
+      resource = Puppet::Type.type(:package).new(
+        :name            => 'mysql-5.1.58-winx64',
+        :source          => 'E:\mysql-5.1.58-winx64.msi',
+        :install_options => { 'INSTALLDIR' => 'C:\mysql "here"' }
+      )
+
+      resource.provider.expects(:execute).with('msiexec.exe /qn /norestart /i E:\mysql-5.1.58-winx64.msi INSTALLDIR="C:\mysql \"here\""')
+      resource.provider.install
+    end
+
+    it 'should not create a state file, if the installation fails' do
+      resource = Puppet::Type.type(:package).new(
+        :name   => 'mysql-5.1.58-winx64',
+        :source => 'E:\mysql-5.1.58-winx64.msi'
+      )
+      resource.provider.stubs(:execute).raises(Puppet::ExecutionFailure.new("Execution of 'msiexec.exe' returned 128: Blargle"))
+      expect { resource.provider.install }.to raise_error(Puppet::ExecutionFailure, /msiexec\.exe/)
+
+      File.should_not be_exists File.join(@state_dir, 'mysql-5.1.58-winx64.yml')
+    end
+
+    it 'should fail if the source parameter is not set' do
+      expect do
+        resource = Puppet::Type.type(:package).new(
+          :name => 'mysql-5.1.58-winx64'
+        )
+      end.to raise_error(Puppet::Error, /The source parameter is required when using the MSI provider/)
+    end
+
+    it 'should fail if the source parameter is empty' do
+      expect do
+        resource = Puppet::Type.type(:package).new(
+          :name   => 'mysql-5.1.58-winx64',
+          :source => ''
+        )
+      end.to raise_error(Puppet::Error, /The source parameter cannot be empty when using the MSI provider/)
+    end
+  end
+
+  describe 'when uninstalling' do
+    before :each do
+      FileUtils.mkdir_p(@state_dir)
+      File.open(File.join(@state_dir, 'mysql-5.1.58-winx64.yml'), 'w') {|f| f.puts 'Hello'}
+    end
+
+    it 'should remove the state file' do
+      resource = Puppet::Type.type(:package).new(
+        :name   => 'mysql-5.1.58-winx64',
+        :source => 'E:\mysql-5.1.58-winx64.msi'
+      )
+      resource.provider.stubs(:msiexec)
+      resource.provider.uninstall
+
+      File.should_not be_exists File.join(Puppet[:vardir], 'db', 'package', 'msi', 'mysql-5.1.58-winx64.yml')
+    end
+
+    it 'should leave the state file if uninstalling fails' do
+      resource = Puppet::Type.type(:package).new(
+        :name   => 'mysql-5.1.58-winx64',
+        :source => 'E:\mysql-5.1.58-winx64.msi'
+      )
+      resource.provider.stubs(:msiexec).raises(Puppet::ExecutionFailure.new("Execution of 'msiexec.exe' returned 128: Blargle"))
+      expect { resource.provider.uninstall }.to raise_error(Puppet::ExecutionFailure, /msiexec\.exe/)
+
+      File.should be_exists File.join(@state_dir, 'mysql-5.1.58-winx64.yml')
+    end
+
+    it 'should fail if the source parameter is not set' do
+      expect do
+        resource = Puppet::Type.type(:package).new(
+          :name => 'mysql-5.1.58-winx64'
+        )
+      end.to raise_error(Puppet::Error, /The source parameter is required when using the MSI provider/)
+    end
+
+    it 'should fail if the source parameter is empty' do
+      expect do
+        resource = Puppet::Type.type(:package).new(
+          :name   => 'mysql-5.1.58-winx64',
+          :source => ''
+        )
+      end.to raise_error(Puppet::Error, /The source parameter cannot be empty when using the MSI provider/)
+    end
+  end
+
+  describe 'when enumerating instances' do
+    it 'should consider the base of the state file name to be the name of the package' do
+      FileUtils.mkdir_p(@state_dir)
+      package_names = ['GoogleChromeStandaloneEnterprise', 'mysql-5.1.58-winx64', 'postgresql-8.3']
+
+      package_names.each do |state_file|
+        File.open(File.join(@state_dir, "#{state_file}.yml"), 'w') {|f| f.puts 'Hello'}
+      end
+
+      installed_package_names = Puppet::Type.type(:package).provider(:msi).instances.collect {|p| p.name}
+
+      installed_package_names.should =~ package_names
+    end
+  end
+
+  it 'should consider the package installed if the state file is present' do
+    FileUtils.mkdir_p(@state_dir)
+    File.open(File.join(@state_dir, 'mysql-5.1.58-winx64.yml'), 'w') {|f| f.puts 'Hello'}
+
+    resource = Puppet::Type.type(:package).new(
+      :name   => 'mysql-5.1.58-winx64',
+      :source => 'E:\mysql-5.1.58-winx64.msi'
+    )
+
+    resource.provider.query.should == {
+      :name   => 'mysql-5.1.58-winx64',
+      :ensure => :installed
+    }
+  end
+
+  it 'should consider the package absent if the state file is missing' do
+    resource = Puppet::Type.type(:package).new(
+      :name   => 'mysql-5.1.58-winx64',
+      :source => 'E:\mysql-5.1.58-winx64.msi'
+    )
+
+    resource.provider.query.should be_nil
+  end
+end

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

@@ -9,6 +9,8 @@ provider_class = Puppet::Type.type(:service).provider(:redhat)
 describe provider_class do
 
   before :each do
+    Puppet.features.stubs(:posix?).returns(true)
+    Puppet.features.stubs(:microsoft_windows?).returns(false)
     @class = Puppet::Type.type(:service).provider(:redhat)
     @resource = stub 'resource'
     @resource.stubs(:[]).returns(nil)

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

@@ -11,6 +11,8 @@ provider_class = Puppet::Type.type(:service).provider(:smf)
 describe provider_class do
 
   before(:each) do
+    Puppet.features.stubs(:posix?).returns(true)
+    Puppet.features.stubs(:microsoft_windows?).returns(false)
     # Create a mock resource
     @resource = Puppet::Type.type(:service).new(
       :name => "/system/myservice", :ensure => :running, :enable => :true)
@@ -111,6 +113,7 @@ describe provider_class do
     it "should import the manifest if service is missing" do
       @provider.expects(:svccfg).with(:import, "/tmp/myservice.xml")
       @provider.expects(:texecute).with(:start, ["/usr/sbin/svcadm", :enable, "/system/myservice"], true)
+      @provider.expects(:svcs).with('-H', '-o', 'state,nstate', "/system/myservice").returns("online\t-")
       @provider.start
     end
 

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

@@ -0,0 +1,25 @@
+#!/usr/bin/env rspec
+#
+# Unit testing for the RedHat service Provider
+#
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:service).provider(:systemd)
+
+describe provider_class do
+  before :each do
+    @class = Puppet::Type.type(:service).provider(:redhat)
+    @resource = stub 'resource'
+    @resource.stubs(:[]).returns(nil)
+    @resource.stubs(:[]).with(:name).returns "myservice.service"
+    @provider = provider_class.new
+    @resource.stubs(:provider).returns @provider
+    @provider.resource = @resource
+  end
+
+  [:enabled?, :enable, :disable, :start, :stop, :status, :restart].each do |method|
+    it "should have a #{method} method" do
+      @provider.should respond_to(method)
+    end
+  end
+end

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

@@ -0,0 +1,166 @@
+#!/usr/bin/env rspec
+#
+# Unit testing for the Windows service Provider
+#
+
+require 'spec_helper'
+
+require 'win32/service' if Puppet.features.microsoft_windows?
+
+describe Puppet::Type.type(:service).provider(:windows), :if => Puppet.features.microsoft_windows? do
+
+  before :each do
+    @resource = Puppet::Type.type(:service).new(:name => 'snmptrap', :provider => :windows)
+
+    @config = Struct::ServiceConfigInfo.new
+
+    @status = Struct::ServiceStatus.new
+
+    Win32::Service.stubs(:config_info).with(@resource[:name]).returns(@config)
+    Win32::Service.stubs(:status).with(@resource[:name]).returns(@status)
+  end
+
+  describe ".instances" do
+    it "should enumerate all services" do
+      list_of_services = ['snmptrap', 'svchost', 'sshd'].map { |s| stub('service', :service_name => s) }
+      Win32::Service.expects(:services).returns(list_of_services)
+
+      described_class.instances.map(&:name).should =~ ['snmptrap', 'svchost', 'sshd']
+    end
+  end
+
+  describe "#start" do
+    it "should call out to the Win32::Service API to start the service" do
+      @config.start_type = Win32::Service.get_start_type(Win32::Service::SERVICE_AUTO_START)
+
+      Win32::Service.expects(:start).with( @resource[:name] )
+
+      @resource.provider.start
+    end
+
+    it "should handle when Win32::Service.start raises a Win32::Service::Error" do
+      @config.start_type = Win32::Service.get_start_type(Win32::Service::SERVICE_AUTO_START)
+
+      Win32::Service.expects(:start).with( @resource[:name] ).raises(
+        Win32::Service::Error.new("The service cannot be started, either because it is disabled or because it has no enabled devices associated with it.")
+      )
+
+      expect { @resource.provider.start }.to raise_error(
+        Puppet::Error,
+        /Cannot start .*, error was: The service cannot be started, either/
+      )
+    end
+
+    describe "when the service is disabled" do
+      before :each do
+        @config.start_type = Win32::Service.get_start_type(Win32::Service::SERVICE_DISABLED)
+        Win32::Service.stubs(:start).with(@resource[:name])
+      end
+
+      it "should refuse to start if not managing enable" do
+        expect { @resource.provider.start }.to raise_error(Puppet::Error, /Will not start disabled service/)
+      end
+
+      it "should enable if managing enable and enable is true" do
+        @resource[:enable] = :true
+
+        Win32::Service.expects(:configure).with('service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_AUTO_START).returns(Win32::Service)
+
+        @resource.provider.start
+      end
+
+      it "should manual start if managing enable and enable is false" do
+        @resource[:enable] = :false
+
+        Win32::Service.expects(:configure).with('service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_DEMAND_START).returns(Win32::Service)
+
+        @resource.provider.start
+      end
+    end
+  end
+
+  describe "#stop" do
+    it "should call out to the Win32::Service API to stop the service" do
+      Win32::Service.expects(:stop).with( @resource[:name] )
+      @resource.provider.stop
+      end
+
+    it "should handle when Win32::Service.stop raises a Win32::Service::Error" do
+      Win32::Service.expects(:stop).with( @resource[:name] ).raises(
+        Win32::Service::Error.new("should not try to stop an already stopped service.")
+      )
+
+      expect { @resource.provider.stop }.to raise_error(
+        Puppet::Error,
+        /Cannot stop .*, error was: should not try to stop an already stopped service/
+      )
+    end
+  end
+
+  describe "#status" do
+    ['stopped', 'paused', 'stop pending', 'pause pending'].each do |state|
+      it "should report a #{state} service as stopped" do
+        @status.current_state = state
+
+        @resource.provider.status.should == :stopped
+      end
+    end
+
+    ["running", "continue pending", "start pending" ].each do |state|
+      it "should report a #{state} service as running" do
+        @status.current_state = state
+
+        @resource.provider.status.should == :running
+      end
+    end
+  end
+
+  describe "#enabled?" do
+    it "should report a service with a startup type of manual as manual" do
+      @config.start_type = Win32::Service.get_start_type(Win32::Service::SERVICE_DEMAND_START)
+
+      @resource.provider.enabled?.should == :manual
+    end
+
+    it "should report a service with a startup type of disabled as false" do
+      @config.start_type = Win32::Service.get_start_type(Win32::Service::SERVICE_DISABLED)
+
+      @resource.provider.enabled?.should == :false
+    end
+
+    # We need to guard this section explicitly since rspec will always
+    # construct all examples, even if it isn't going to run them.
+    if Puppet.features.microsoft_windows?
+      [Win32::Service::SERVICE_AUTO_START, Win32::Service::SERVICE_BOOT_START, Win32::Service::SERVICE_SYSTEM_START].each do |start_type_const|
+        start_type = Win32::Service.get_start_type(start_type_const)
+        it "should report a service with a startup type of '#{start_type}' as true" do
+          @config.start_type = start_type
+
+          @resource.provider.enabled?.should == :true
+        end
+      end
+    end
+  end
+
+  describe "#enable" do
+    it "should set service start type to Service_Auto_Start when enabled" do
+      Win32::Service.expects(:configure).with('service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_AUTO_START).returns(Win32::Service)
+      @resource.provider.enable
+    end
+  end
+
+  describe "#disable" do
+    it "should set service start type to Service_Disabled when disabled" do
+      Win32::Service.expects(:configure).with('service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_DISABLED).returns(Win32::Service)
+      @resource.provider.disable
+     end
+  end
+
+  describe "#manual_start" do
+    it "should set service start type to Service_Demand_Start (manual) when manual" do
+      Win32::Service.expects(:configure).with('service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_DEMAND_START).returns(Win32::Service)
+      @resource.provider.manual_start
+    end
+  end
+
+end

data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb

@@ -5,7 +5,7 @@ require 'puppet_spec/files'
 
 provider_class = Puppet::Type.type(:ssh_authorized_key).provider(:parsed)
 
-describe provider_class do
+describe provider_class, :unless => Puppet.features.microsoft_windows? do
   include PuppetSpec::Files
 
   before :each do
@@ -77,7 +77,7 @@ describe provider_class do
   end
 end
 
-describe provider_class do
+describe provider_class, :unless => Puppet.features.microsoft_windows? do
   before :each do
     @resource = Puppet::Type.type(:ssh_authorized_key).new(:name => "foo", :user => "random_bob")
 

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

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2008-3-10.
-#  Copyright (c) 2006. All rights reserved.
-
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:user).provider(:ldap)

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 provider_class = Puppet::Type.type(:user).provider(:user_role_add)
 
-describe provider_class do
+describe provider_class, :fails_on_windows => true do
   before do
     @resource = stub("resource", :name => "myuser", :managehome? => nil)
     @resource.stubs(:should).returns "fakeval"

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 provider_class = Puppet::Type.type(:user).provider(:useradd)
 
-describe provider_class do
+describe provider_class, :fails_on_windows => true do
   before do
     @resource = stub("resource", :name => "myuser", :managehome? => nil)
     @resource.stubs(:should).returns "fakeval"

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

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+
+require 'spec_helper'
+
+describe Puppet::Type.type(:user).provider(:windows_adsi) do
+  let(:resource) do
+    Puppet::Type.type(:user).new(
+      :title => 'testuser',
+      :comment => 'Test J. User',
+      :provider => :windows_adsi
+    )
+  end
+
+  let(:provider) { resource.provider }
+
+  let(:connection) { stub 'connection' }
+
+  before :each do
+    Puppet::Util::ADSI.stubs(:computer_name).returns('testcomputername')
+    Puppet::Util::ADSI.stubs(:connect).returns connection
+  end
+
+  describe ".instances" do
+    it "should enumerate all users" do
+      names = ['user1', 'user2', 'user3']
+      stub_users = names.map{|n| stub(:name => n)}
+
+      connection.stubs(:execquery).with("select * from win32_useraccount").returns(stub_users)
+
+      described_class.instances.map(&:name).should =~ names
+    end
+  end
+
+  it "should provide access to a Puppet::Util::ADSI::User object" do
+    provider.user.should be_a(Puppet::Util::ADSI::User)
+  end
+
+  describe "when managing groups" do
+    it 'should return the list of groups as a comma-separated list' do
+      provider.user.stubs(:groups).returns ['group1', 'group2', 'group3']
+
+      provider.groups.should == 'group1,group2,group3'
+    end
+
+    it "should return absent if there are no groups" do
+      provider.user.stubs(:groups).returns []
+
+      provider.groups.should == ''
+    end
+
+    it 'should be able to add a user to a set of groups' do
+      resource[:membership] = :minimum
+      provider.user.expects(:set_groups).with('group1,group2', true)
+
+      provider.groups = 'group1,group2'
+
+      resource[:membership] = :inclusive
+      provider.user.expects(:set_groups).with('group1,group2', false)
+
+      provider.groups = 'group1,group2'
+    end
+  end
+
+  describe "when creating a user" do
+    it "should create the user on the system and set its other properties" do
+      resource[:groups]     = ['group1', 'group2']
+      resource[:membership] = :inclusive
+      resource[:comment]    = 'a test user'
+      resource[:home]       = 'C:\Users\testuser'
+
+      user = stub 'user'
+      Puppet::Util::ADSI::User.expects(:create).with('testuser').returns user
+
+      user.stubs(:groups).returns(['group2', 'group3'])
+
+      user.expects(:set_groups).with('group1,group2', false)
+      user.expects(:[]=).with('Description', 'a test user')
+      user.expects(:[]=).with('HomeDirectory', 'C:\Users\testuser')
+
+      provider.create
+    end
+  end
+
+  it 'should be able to test whether a user exists' do
+    Puppet::Util::ADSI.stubs(:connect).returns stub('connection')
+    provider.should be_exists
+
+    Puppet::Util::ADSI.stubs(:connect).returns nil
+    provider.should_not be_exists
+  end
+
+  it 'should be able to delete a user' do
+    connection.expects(:Delete).with('user', 'testuser')
+
+    provider.delete
+  end
+
+  it "should commit the user when flushed" do
+    provider.user.expects(:commit)
+
+    provider.flush
+  end
+
+  [:uid, :gid, :shell].each do |prop|
+    it "should warn when trying to manage the #{prop} property" do
+      provider.expects(:warning).with { |msg| msg =~ /No support for managing property #{prop}/ }
+      provider.send("#{prop}=", 'foo')
+    end
+  end
+end

data/spec/unit/relationship_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2007-11-1.
-#  Copyright (c) 2006. All rights reserved.
-
 require 'spec_helper'
 require 'puppet/relationship'
 

data/spec/unit/resource/catalog_spec.rb

@@ -2,28 +2,47 @@
 require 'spec_helper'
 
 describe Puppet::Resource::Catalog, "when compiling" do
+  include PuppetSpec::Files
 
   before do
-    @basepath = Puppet.features.posix? ? "/somepath" : "C:/somepath"
+    @basepath = make_absolute("/somepath")
     # stub this to not try to create state.yaml
     Puppet::Util::Storage.stubs(:store)
   end
 
-  it "should be an Expirer" do
-    Puppet::Resource::Catalog.ancestors.should be_include(Puppet::Util::Cacher::Expirer)
-  end
+  it "should write its resources' types, namevars" do
+    catalog = Puppet::Resource::Catalog.new("host")
 
-  it "should always be expired if it's not applying" do
-    @catalog = Puppet::Resource::Catalog.new("host")
-    @catalog.expects(:applying?).returns false
-    @catalog.should be_dependent_data_expired(Time.now)
+    resourcefile = tmpfile('resourcefile')
+    Puppet[:resourcefile] = resourcefile
+
+    res = Puppet::Type.type('file').new(:title => '/tmp/sam')
+    res.file = 'site.pp'
+    res.line = 21
+
+    res2 = Puppet::Type.type('exec').new(:title => 'bob', :command => '/bin/rm -rf /')
+    res2.file = '/modules/bob/manifests/bob.pp'
+    res2.line = 42
+
+    comp_res = Puppet::Type.type('component').new(:title => 'Class[Main]')
+
+    catalog.add_resource(res, res2, comp_res)
+    catalog.write_resource_file
+    File.open(resourcefile).readlines.map(&:chomp).should =~ [
+      "file[/tmp/sam]",
+      "exec[/bin/rm -rf /]"
+    ]
   end
 
-  it "should not be expired if it's applying and the timestamp is late enough" do
-    @catalog = Puppet::Resource::Catalog.new("host")
-    @catalog.expire
-    @catalog.expects(:applying?).returns true
-    @catalog.should_not be_dependent_data_expired(Time.now)
+  it "should log an error if unable to write to the resource file" do
+    catalog = Puppet::Resource::Catalog.new("host")
+    Puppet[:resourcefile] = '/not/writable/file'
+
+    catalog.add_resource(Puppet::Type.type('file').new(:title => '/tmp/foo'))
+    catalog.write_resource_file
+    @logs.size.should == 1
+    @logs.first.message.should =~ /Could not create resource file/
+    @logs.first.level.should == :err
   end
 
   it "should be able to write its list of classes to the class file" do
@@ -508,7 +527,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.resource(:file, @basepath+"/something").should equal(resource)
     end
 
-    it "should not create aliases for non-isomorphic resources whose names do not match their titles" do
+    it "should not create aliases for non-isomorphic resources whose names do not match their titles", :fails_on_windows => true  do
       resource = Puppet::Type.type(:exec).new(:title => "testing", :command => "echo", :path => %w{/bin /usr/bin /usr/local/bin})
 
       @catalog.add_resource(resource)
@@ -614,11 +633,12 @@ describe Puppet::Resource::Catalog, "when compiling" do
       end
 
       it "should conflict when its uniqueness key matches another resource's title" do
-        @resource = Puppet::Type.type(:file).new(:title => "/tmp/foo")
-        @other    = Puppet::Type.type(:file).new(:title => "another file", :path => "/tmp/foo")
+        path = make_absolute("/tmp/foo")
+        @resource = Puppet::Type.type(:file).new(:title => path)
+        @other    = Puppet::Type.type(:file).new(:title => "another file", :path => path)
 
         @catalog.add_resource(@resource)
-        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias File\[another file\] to \["\/tmp\/foo"\].*resource \["File", "\/tmp\/foo"\] already defined/)
+        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias File\[another file\] to \["#{Regexp.escape(path)}"\].*resource \["File", "#{Regexp.escape(path)}"\] already defined/)
       end
 
       it "should conflict when its uniqueness key matches the uniqueness key derived from another resource's title" do
@@ -690,11 +710,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.apply(:ignoreschedules => true)
     end
 
-    it "should expire cached data in the resources both before and after the transaction" do
-      @catalog.expects(:expire).times(2)
-      @catalog.apply
-    end
-
     describe "host catalogs" do
 
       # super() doesn't work in the setup method for some reason
@@ -855,8 +870,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @real_indirection = Puppet::Resource::Catalog.indirection
 
       @indirection = stub 'indirection', :name => :catalog
-
-      Puppet::Util::Cacher.expire
     end
 
     it "should use the value of the 'catalog_terminus' setting to determine its terminus class" do
@@ -875,7 +888,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
     end
 
     after do
-      Puppet::Util::Cacher.expire
       @real_indirection.reset_terminus_class
     end
   end