puppet 5.5.22-universal-darwin → 6.0.0-universal-darwin

data/spec/unit/util/at_fork_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe 'Puppet::Util::AtFork' do
@@ -18,7 +19,7 @@ describe 'Puppet::Util::AtFork' do
   describe '.get_handler' do
     context 'when on Solaris' do
       before :each do
-        expect(Facter).to receive(:value).with(:operatingsystem).and_return('Solaris')
+        Facter.expects(:value).with(:operatingsystem).returns('Solaris')
       end
 
       after :each do
@@ -28,7 +29,7 @@ describe 'Puppet::Util::AtFork' do
       end
 
       def stub_solaris_handler(stub_noop_too = false)
-        allow(Puppet::Util::AtFork).to receive(:require).with(anything) do |lib|
+        Puppet::Util::AtFork.stubs(:require).with() do |lib|
           if lib == 'puppet/util/at_fork/solaris'
             load lib + '.rb'
             true
@@ -40,7 +41,7 @@ describe 'Puppet::Util::AtFork' do
           else
             false
           end
-        end.and_return(true)
+        end.returns(true)
 
         unless stub_noop_too
           Object.class_exec do
@@ -55,18 +56,18 @@ describe 'Puppet::Util::AtFork' do
           end
         end
 
-        allow(TOPLEVEL_BINDING.eval('self')).to receive(:require).with(anything) do |lib|
+        TOPLEVEL_BINDING.eval('self').stubs(:require).with() do |lib|
           if lib == 'fiddle'
             raise LoadError, 'no fiddle' if stub_noop_too
           else
             Kernel.require lib
           end
           true
-        end.and_return(true)
+        end.returns(true)
       end
 
       it %q(should return the Solaris specific AtFork handler) do
-        allow(Puppet::Util::AtFork).to receive(:require).with(anything) do |lib|
+        Puppet::Util::AtFork.stubs(:require).with() do |lib|
           if lib == 'puppet/util/at_fork/solaris'
             Puppet::Util::AtFork.class_exec do
               const_set(:Solaris, Class.new)
@@ -75,7 +76,7 @@ describe 'Puppet::Util::AtFork' do
           else
             false
           end
-        end.and_return(true)
+        end.returns(true)
         load 'puppet/util/at_fork.rb'
         expect(Puppet::Util::AtFork.get_handler.class).to eq(Puppet::Util::AtFork::Solaris)
       end
@@ -88,24 +89,24 @@ describe 'Puppet::Util::AtFork' do
 
       it %q(should fail when libcontract cannot be loaded) do
         stub_solaris_handler
-        expect(Fiddle::Handle).to receive(:new).with(/^libcontract.so.*/).and_raise(Fiddle::DLError, 'no such library')
+        Fiddle::Handle.expects(:new).with(regexp_matches(/^libcontract.so.*/)).raises(Fiddle::DLError, 'no such library')
         expect { load 'puppet/util/at_fork.rb' }.to raise_error(Fiddle::DLError, 'no such library')
       end
 
       it %q(should fail when libcontract doesn't define all the necessary functions) do
         stub_solaris_handler
-        handle = double('Fiddle::Handle')
-        expect(Fiddle::Handle).to receive(:new).with(/^libcontract.so.*/).and_return(handle)
-        expect(handle).to receive(:[]).and_raise(Fiddle::DLError, 'no such method')
+        handle = stub('Fiddle::Handle')
+        Fiddle::Handle.expects(:new).with(regexp_matches(/^libcontract.so.*/)).returns(handle)
+        handle.expects(:[]).raises(Fiddle::DLError, 'no such method')
         expect { load 'puppet/util/at_fork.rb' }.to raise_error(Fiddle::DLError, 'no such method')
       end
 
       it %q(the returned Solaris specific handler should respond to the expected methods) do
         stub_solaris_handler
-        handle = double('Fiddle::Handle')
-        expect(Fiddle::Handle).to receive(:new).with(/^libcontract.so.*/).and_return(handle)
-        allow(handle).to receive(:[]).and_return(nil)
-        allow(Fiddle::Function).to receive(:new).and_return(Proc.new {})
+        handle = stub('Fiddle::Handle')
+        Fiddle::Handle.expects(:new).with(regexp_matches(/^libcontract.so.*/)).returns(handle)
+        handle.stubs(:[]).returns(nil)
+        Fiddle::Function.stubs(:new).returns(Proc.new {})
         load 'puppet/util/at_fork.rb'
         expect(Puppet::Util::AtFork.get_handler.public_methods).to include(*EXPECTED_HANDLER_METHODS)
       end
@@ -113,11 +114,11 @@ describe 'Puppet::Util::AtFork' do
 
     context 'when NOT on Solaris' do
       before :each do
-        expect(Facter).to receive(:value).with(:operatingsystem).and_return(nil)
+        Facter.expects(:value).with(:operatingsystem).returns(nil)
       end
 
       def stub_noop_handler(namespace_only = false)
-        allow(Puppet::Util::AtFork).to receive(:require).with(anything) do |lib|
+        Puppet::Util::AtFork.stubs(:require).with() do |lib|
           if lib == 'puppet/util/at_fork/noop'
             if namespace_only
               Puppet::Util::AtFork.class_exec do
@@ -130,7 +131,7 @@ describe 'Puppet::Util::AtFork' do
           else
             false
           end
-        end.and_return(true)
+        end.returns(true)
       end
 
       it %q(should return the Noop AtFork handler) do

data/spec/unit/util/autoload_spec.rb

@@ -1,21 +1,39 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
+require 'fileutils'
 
 require 'puppet/util/autoload'
 
 describe Puppet::Util::Autoload do
   include PuppetSpec::Files
 
+  let(:env) { Puppet::Node::Environment.create(:foo, []) }
+
   before do
     @autoload = Puppet::Util::Autoload.new("foo", "tmp")
 
     @loaded = {}
-    allow(@autoload.class).to receive(:loaded).and_return(@loaded)
+    @autoload.class.stubs(:loaded).returns(@loaded)
   end
 
   describe "when building the search path" do
     before :each do
       ## modulepath/libdir can't be used until after app settings are initialized, so we need to simulate that:
-      expect(Puppet.settings).to receive(:app_defaults_initialized?).and_return(true).at_least(:once)
+      Puppet.settings.stubs(:app_defaults_initialized?).returns(true)
+    end
+
+    def with_libdir(libdir)
+      begin
+        Puppet::Util::Autoload.instance_variable_set(:@initialized, false)
+        old_loadpath = $LOAD_PATH.dup
+        old_libdir = Puppet[:libdir]
+        Puppet[:libdir] = libdir
+        yield
+      ensure
+        Puppet[:libdir] = old_libdir
+        $LOAD_PATH.clear
+        $LOAD_PATH.concat(old_loadpath)
+      end
     end
 
     it "should collect all of the lib directories that exist in the current environment's module path" do
@@ -43,135 +61,146 @@ describe Puppet::Util::Autoload do
     it "ignores the configured environment when it doesn't exist" do
       Puppet[:environment] = 'nonexistent'
 
-      Puppet.override({ :environments => Puppet::Environments::Static.new() }) do
-        expect(@autoload.class.module_directories(nil)).to be_empty
+      env = Puppet::Node::Environment.create(:dev, [])
+      Puppet.override(environments: Puppet::Environments::Static.new(env)) do
+        expect(@autoload.class.module_directories(Puppet.lookup(:current_environment))).to be_empty
       end
     end
 
-    it "uses the configured environment when no environment is given" do
+    it "raises when no environment is given" do
       Puppet[:environment] = 'nonexistent'
 
-      Puppet.override({ :environments => Puppet::Environments::Static.new() }) do
-        expect(@autoload.class.module_directories(nil)).to be_empty
+      Puppet.override(environments: Puppet::Environments::Static.new) do
+        expect {
+          @autoload.class.module_directories(nil)
+        }.to raise_error(ArgumentError, /Autoloader requires an environment/)
       end
     end
 
-    it "should include the module directories, the Puppet libdir, and all of the Ruby load directories" do
-      Puppet[:libdir] = '/libdir1'
-      expect(@autoload.class).to receive(:gem_directories).and_return(%w{/one /two})
-      expect(@autoload.class).to receive(:module_directories).and_return(%w{/three /four})
-      expect(@autoload.class.search_directories(nil)).to eq(%w{/one /two /three /four} + [Puppet[:libdir]] + $LOAD_PATH)
+    it "should include the module directories, the Puppet libdir, Ruby load directories, and vendored modules" do
+      vendor_dir = tmpdir('vendor_modules')
+      module_libdir = File.join(vendor_dir, 'amodule_core', 'lib')
+      FileUtils.mkdir_p(module_libdir)
+
+      libdir = File.expand_path('/libdir1')
+      Puppet[:vendormoduledir] = vendor_dir
+
+      with_libdir(libdir) do
+        @autoload.class.expects(:gem_directories).returns %w{/one /two}
+        @autoload.class.expects(:module_directories).returns %w{/three /four}
+        dirs = @autoload.class.search_directories(nil)
+        expect(dirs[0..4]).to eq(%w{/one /two /three /four} + [libdir])
+        expect(dirs.last).to eq(module_libdir)
+      end
     end
 
     it "does not split the Puppet[:libdir]" do
-      Puppet[:libdir] = "/libdir1#{File::PATH_SEPARATOR}/libdir2"
-
-      expect(@autoload.class.libdirs).to eq([Puppet[:libdir]])
+      dir = File.expand_path("/libdir1#{File::PATH_SEPARATOR}/libdir2")
+      with_libdir(dir) do
+        @autoload.class.expects(:gem_directories).returns %w{/one /two}
+        @autoload.class.expects(:module_directories).returns %w{/three /four}
+        dirs = @autoload.class.search_directories(nil)
+        expect(dirs).to include(dir)
+      end
     end
   end
 
   describe "when loading a file" do
     before do
-      allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a")])
-      allow(FileTest).to receive(:directory?).and_return(true)
+      @autoload.class.stubs(:search_directories).returns [make_absolute("/a")]
+      FileTest.stubs(:directory?).returns true
       @time_a = Time.utc(2010, 'jan', 1, 6, 30)
-      allow(File).to receive(:mtime).and_return(@time_a)
+      File.stubs(:mtime).returns @time_a
+    end
+
+    after(:each) do
+      $LOADED_FEATURES.delete("/a/tmp/myfile.rb")
     end
 
     [RuntimeError, LoadError, SyntaxError].each do |error|
       it "should die with Puppet::Error if a #{error.to_s} exception is thrown" do
-        allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+        Puppet::FileSystem.stubs(:exist?).returns true
 
-        expect(Kernel).to receive(:load).and_raise(error)
+        Kernel.expects(:load).raises error
 
-        expect { @autoload.load("foo") }.to raise_error(Puppet::Error)
+        expect { @autoload.load("foo", env) }.to raise_error(Puppet::Error)
       end
     end
 
     it "should not raise an error if the file is missing" do
-      expect(@autoload.load("foo")).to eq(false)
+      expect(@autoload.load("foo", env)).to eq(false)
     end
 
     it "should register loaded files with the autoloader" do
-      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
-      allow(Kernel).to receive(:load)
-      @autoload.load("myfile")
+      Puppet::FileSystem.stubs(:exist?).returns true
+      Kernel.stubs(:load)
+      @autoload.load("myfile", env)
 
       expect(@autoload.class.loaded?("tmp/myfile.rb")).to be
-
-      $LOADED_FEATURES.delete("tmp/myfile.rb")
     end
 
     it "should be seen by loaded? on the instance using the short name" do
-      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
-      allow(Kernel).to receive(:load)
-      @autoload.load("myfile")
+      Puppet::FileSystem.stubs(:exist?).returns true
+      Kernel.stubs(:load)
+      @autoload.load("myfile", env)
 
       expect(@autoload.loaded?("myfile.rb")).to be
-
-      $LOADED_FEATURES.delete("tmp/myfile.rb")
     end
 
     it "should register loaded files with the main loaded file list so they are not reloaded by ruby" do
-      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
-      allow(Kernel).to receive(:load)
-
-      @autoload.load("myfile")
+      Puppet::FileSystem.stubs(:exist?).returns true
+      Kernel.stubs(:load)
 
-      expect($LOADED_FEATURES).to be_include("tmp/myfile.rb")
+      @autoload.load("myfile", env)
 
-      $LOADED_FEATURES.delete("tmp/myfile.rb")
+      expect($LOADED_FEATURES).to be_include(make_absolute("/a/tmp/myfile.rb"))
     end
 
     it "should load the first file in the searchpath" do
-      allow(@autoload).to receive(:search_directories).and_return([make_absolute("/a"), make_absolute("/b")])
-      allow(FileTest).to receive(:directory?).and_return(true)
-      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
-      expect(Kernel).to receive(:load).with(make_absolute("/a/tmp/myfile.rb"), any_args)
-
-      @autoload.load("myfile")
+      @autoload.stubs(:search_directories).returns [make_absolute("/a"), make_absolute("/b")]
+      FileTest.stubs(:directory?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
+      Kernel.expects(:load).with(make_absolute("/a/tmp/myfile.rb"), optionally(anything))
 
-      $LOADED_FEATURES.delete("tmp/myfile.rb")
+      @autoload.load("myfile", env)
     end
 
     it "should treat equivalent paths to a loaded file as loaded" do
-      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
-      allow(Kernel).to receive(:load)
-      @autoload.load("myfile")
+      Puppet::FileSystem.stubs(:exist?).returns true
+      Kernel.stubs(:load)
+      @autoload.load("myfile", env)
 
       expect(@autoload.class.loaded?("tmp/myfile")).to be
       expect(@autoload.class.loaded?("tmp/./myfile.rb")).to be
       expect(@autoload.class.loaded?("./tmp/myfile.rb")).to be
       expect(@autoload.class.loaded?("tmp/../tmp/myfile.rb")).to be
-
-      $LOADED_FEATURES.delete("tmp/myfile.rb")
     end
   end
 
   describe "when loading all files" do
     before do
-      allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a")])
-      allow(FileTest).to receive(:directory?).and_return(true)
-      allow(Dir).to receive(:glob).and_return([make_absolute("/a/foo/file.rb")])
-      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      @autoload.class.stubs(:search_directories).returns [make_absolute("/a")]
+      FileTest.stubs(:directory?).returns true
+      Dir.stubs(:glob).returns [make_absolute("/a/foo/file.rb")]
+      Puppet::FileSystem.stubs(:exist?).returns true
       @time_a = Time.utc(2010, 'jan', 1, 6, 30)
-      allow(File).to receive(:mtime).and_return(@time_a)
+      File.stubs(:mtime).returns @time_a
 
-      allow(@autoload.class).to receive(:loaded?).and_return(false)
+      @autoload.class.stubs(:loaded?).returns(false)
     end
 
     [RuntimeError, LoadError, SyntaxError].each do |error|
       it "should die an if a #{error.to_s} exception is thrown" do
-        expect(Kernel).to receive(:load).and_raise(error)
+        Kernel.expects(:load).raises error
 
-        expect { @autoload.loadall }.to raise_error(Puppet::Error)
+        expect { @autoload.loadall(env) }.to raise_error(Puppet::Error)
       end
     end
 
     it "should require the full path to the file" do
-      expect(Kernel).to receive(:load).with(make_absolute("/a/foo/file.rb"), any_args)
+      Kernel.expects(:load).with(make_absolute("/a/foo/file.rb"), optionally(anything))
 
-      @autoload.loadall
+      @autoload.loadall(env)
     end
   end
 
@@ -189,71 +218,71 @@ describe Puppet::Util::Autoload do
     end
 
     it "#changed? should return true for a file that was not loaded" do
-      expect(@autoload.class.changed?(@file_a)).to be
+      expect(@autoload.class.changed?(@file_a, env)).to be
     end
 
     it "changes should be seen by changed? on the instance using the short name" do
-      allow(File).to receive(:mtime).and_return(@first_time)
-      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
-      allow(Kernel).to receive(:load)
-      @autoload.load("myfile")
+      File.stubs(:mtime).returns(@first_time)
+      Puppet::FileSystem.stubs(:exist?).returns true
+      Kernel.stubs(:load)
+      @autoload.load("myfile", env)
       expect(@autoload.loaded?("myfile")).to be
-      expect(@autoload.changed?("myfile")).not_to be
+      expect(@autoload.changed?("myfile", env)).not_to be
 
-      allow(File).to receive(:mtime).and_return(@second_time)
-      expect(@autoload.changed?("myfile")).to be
+      File.stubs(:mtime).returns(@second_time)
+      expect(@autoload.changed?("myfile", env)).to be
 
       $LOADED_FEATURES.delete("tmp/myfile.rb")
     end
 
     describe "in one directory" do
       before :each do
-        allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a")])
-        expect(File).to receive(:mtime).with(@file_a).and_return(@first_time)
+        @autoload.class.stubs(:search_directories).returns [make_absolute("/a")]
+        File.expects(:mtime).with(@file_a).returns(@first_time)
         @autoload.class.mark_loaded("file", @file_a)
       end
 
       it "should reload if mtime changes" do
-        allow(File).to receive(:mtime).with(@file_a).and_return(@first_time + 60)
-        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(true)
-        expect(Kernel).to receive(:load).with(@file_a, any_args)
-        @autoload.class.reload_changed
+        File.stubs(:mtime).with(@file_a).returns(@first_time + 60)
+        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns true
+        Kernel.expects(:load).with(@file_a, optionally(anything))
+        @autoload.class.reload_changed(env)
       end
 
       it "should do nothing if the file is deleted" do
-        allow(File).to receive(:mtime).with(@file_a).and_raise(Errno::ENOENT)
-        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(false)
-        expect(Kernel).not_to receive(:load)
-        @autoload.class.reload_changed
+        File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
+        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns false
+        Kernel.expects(:load).never
+        @autoload.class.reload_changed(env)
       end
     end
 
     describe "in two directories" do
       before :each do
-        allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a"), make_absolute("/b")])
+        @autoload.class.stubs(:search_directories).returns [make_absolute("/a"), make_absolute("/b")]
       end
 
       it "should load b/file when a/file is deleted" do
-        expect(File).to receive(:mtime).with(@file_a).and_return(@first_time)
+        File.expects(:mtime).with(@file_a).returns(@first_time)
         @autoload.class.mark_loaded("file", @file_a)
-        allow(File).to receive(:mtime).with(@file_a).and_raise(Errno::ENOENT)
-        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(false)
-        allow(Puppet::FileSystem).to receive(:exist?).with(@file_b).and_return(true)
-        allow(File).to receive(:mtime).with(@file_b).and_return(@first_time)
-        expect(Kernel).to receive(:load).with(@file_b, any_args)
-        @autoload.class.reload_changed
+        File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
+        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns false
+        Puppet::FileSystem.stubs(:exist?).with(@file_b).returns true
+        File.stubs(:mtime).with(@file_b).returns @first_time
+        Kernel.expects(:load).with(@file_b, optionally(anything))
+        @autoload.class.reload_changed(env)
         expect(@autoload.class.send(:loaded)["file"]).to eq([@file_b, @first_time])
       end
 
       it "should load a/file when b/file is loaded and a/file is created" do
-        allow(File).to receive(:mtime).with(@file_b).and_return(@first_time)
-        allow(Puppet::FileSystem).to receive(:exist?).with(@file_b).and_return(true)
+        File.stubs(:mtime).with(@file_b).returns @first_time
+        Puppet::FileSystem.stubs(:exist?).with(@file_b).returns true
         @autoload.class.mark_loaded("file", @file_b)
 
-        allow(File).to receive(:mtime).with(@file_a).and_return(@first_time)
-        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(true)
-        expect(Kernel).to receive(:load).with(@file_a, any_args)
-        @autoload.class.reload_changed
+        File.stubs(:mtime).with(@file_a).returns @first_time
+        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns true
+        Kernel.expects(:load).with(@file_a, optionally(anything))
+        @autoload.class.reload_changed(env)
         expect(@autoload.class.send(:loaded)["file"]).to eq([@file_a, @first_time])
       end
     end
@@ -265,7 +294,7 @@ describe Puppet::Util::Autoload do
       expect(Puppet::Util::Autoload.cleanpath(path)).to eq(path)
     end
 
-    describe "on Windows", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows", :if => Puppet::Util::Platform.windows? do
       it "should convert c:\ to c:/" do
         expect(Puppet::Util::Autoload.cleanpath('c:\\')).to eq('c:/')
       end