puppet 3.8.7-x64-mingw32 → 4.0.0.rc1-x64-mingw32

data/spec/shared_behaviours/file_server_terminus.rb

@@ -36,6 +36,6 @@ shared_examples_for "Puppet::Indirector::FileServerTerminus" do
 
     path = File.join(@path, "myfile")
 
-    @terminus.find(@request).should be_instance_of(@test_class)
+    expect(@terminus.find(@request)).to be_instance_of(@test_class)
   end
 end

data/spec/shared_behaviours/hiera_indirections.rb

@@ -28,18 +28,18 @@ shared_examples_for "Hiera indirection" do |test_klass, fixture_dir|
   end
 
   it "should be the default data_binding terminus" do
-    Puppet.settings[:data_binding_terminus].should == :hiera
+    expect(Puppet.settings[:data_binding_terminus]).to eq(:hiera)
   end
 
   it "should raise an error if we don't have the hiera feature" do
     Puppet.features.expects(:hiera?).returns(false)
-    lambda { test_klass.new }.should raise_error RuntimeError,
+    expect { test_klass.new }.to raise_error RuntimeError,
       "Hiera terminus not supported without hiera library"
   end
 
   describe "the behavior of the hiera_config method", :if => Puppet.features.hiera? do
     it "should override the logger and set it to puppet" do
-      test_klass.hiera_config[:logger].should == "puppet"
+      expect(test_klass.hiera_config[:logger]).to eq("puppet")
     end
 
     context "when the Hiera configuration file does not exist" do
@@ -58,7 +58,7 @@ shared_examples_for "Hiera indirection" do |test_klass, fixture_dir|
       it "should only configure the logger and set it to puppet" do
         Puppet.expects(:warning).with(
          "Config file #{path} not found, using Hiera defaults")
-        test_klass.hiera_config.should == { :logger => 'puppet' }
+        expect(test_klass.hiera_config).to eq({ :logger => 'puppet' })
       end
     end
   end
@@ -68,26 +68,26 @@ shared_examples_for "Hiera indirection" do |test_klass, fixture_dir|
     let(:data_binder) { test_klass.new }
 
     it "should support looking up an integer" do
-      data_binder.find(request("integer")).should == 3000
+      expect(data_binder.find(request("integer"))).to eq(3000)
     end
 
     it "should support looking up a string" do
-      data_binder.find(request("string")).should == 'apache'
+      expect(data_binder.find(request("string"))).to eq('apache')
     end
 
     it "should support looking up an array" do
-      data_binder.find(request("array")).should == [
+      expect(data_binder.find(request("array"))).to eq([
         '0.ntp.puppetlabs.com',
         '1.ntp.puppetlabs.com',
-      ]
+      ])
     end
 
     it "should support looking up a hash" do
-      data_binder.find(request("hash")).should == {
+      expect(data_binder.find(request("hash"))).to eq({
         'user'  => 'Hightower',
         'group' => 'admin',
         'mode'  => '0644'
-      }
+      })
     end
 
     it "raises a data binding error if hiera cannot parse the yaml data" do

data/spec/shared_behaviours/iterative_functions.rb

@@ -5,7 +5,7 @@ shared_examples_for 'all iterative functions hash handling' do |func|
       {a=>1}.#{func} |$v| { notify { "${v[0]} ${v[1]}": } }
     MANIFEST
 
-    catalog.resource(:notify, "a 1").should_not be_nil
+    expect(catalog.resource(:notify, "a 1")).not_to be_nil
   end
 end
 

data/spec/shared_behaviours/memory_terminus.rb

@@ -1,11 +1,11 @@
 shared_examples_for "A Memory Terminus" do
   it "should find no instances by default" do
-    @searcher.find(@request).should be_nil
+    expect(@searcher.find(@request)).to be_nil
   end
 
   it "should be able to find instances that were previously saved" do
     @searcher.save(@request)
-    @searcher.find(@request).should equal(@instance)
+    expect(@searcher.find(@request)).to equal(@instance)
   end
 
   it "should replace existing saved instances when a new instance with the same name is saved" do
@@ -13,16 +13,16 @@ shared_examples_for "A Memory Terminus" do
     two = stub 'second', :name => @name
     trequest = stub 'request', :key => @name, :instance => two
     @searcher.save(trequest)
-    @searcher.find(@request).should equal(two)
+    expect(@searcher.find(@request)).to equal(two)
   end
 
   it "should be able to remove previously saved instances" do
     @searcher.save(@request)
     @searcher.destroy(@request)
-    @searcher.find(@request).should be_nil
+    expect(@searcher.find(@request)).to be_nil
   end
 
   it "should fail when asked to destroy an instance that does not exist" do
-    proc { @searcher.destroy(@request) }.should raise_error(ArgumentError)
+    expect { @searcher.destroy(@request) }.to raise_error(ArgumentError)
   end
 end

data/spec/shared_behaviours/path_parameters.rb

@@ -49,7 +49,7 @@ shared_examples_for "all pathname parameters with arrays" do |win32|
               to raise_error Puppet::Error, /fully qualified/
           else
             instance = instance(data)
-            instance[@param].should == data
+            expect(instance[@param]).to eq(data)
           end
         end
 
@@ -59,7 +59,7 @@ shared_examples_for "all pathname parameters with arrays" do |win32|
               to raise_error Puppet::Error, /fully qualified/
           else
             instance = instance(data + data)
-            instance[@param].should == (data + data)
+            expect(instance[@param]).to eq(data + data)
           end
         end
       end
@@ -87,7 +87,7 @@ shared_examples_for "all path parameters" do |param, options|
     @param = param
   end
 
-  describe "on a Unix-like platform it", :as_platform => :posix do
+  describe "on a Unix-like platform it", :if => Puppet.features.posix? do
     if array then
       it_should_behave_like "all pathname parameters with arrays", false
     end
@@ -95,7 +95,7 @@ shared_examples_for "all path parameters" do |param, options|
     it "should accept a fully qualified path" do
       path = File.join('', 'foo')
       instance = instance(path)
-      instance[@param].should == path
+      expect(instance[@param]).to eq(path)
     end
 
     it "should give a useful error when the path is not absolute" do
@@ -115,7 +115,7 @@ shared_examples_for "all path parameters" do |param, options|
     end
   end
 
-  describe "on a Windows-like platform it", :as_platform => :windows do
+  describe "on a Windows-like platform it", :if => Puppet.features.microsoft_windows? do
     if array then
       it_should_behave_like "all pathname parameters with arrays", true
     end
@@ -134,7 +134,7 @@ shared_examples_for "all path parameters" do |param, options|
     it "also accepts Unix style path separators" do
       path = 'C:/Program Files'
       instance = instance(path)
-      instance[@param].should == path
+      expect(instance[@param]).to eq(path)
     end
 
     { "Unix" => '/', "Win32" => '\\' }.each do |style, slash|
@@ -142,7 +142,7 @@ shared_examples_for "all path parameters" do |param, options|
         it "should accept drive letter '#{drive}' with #{style} path separators " do
           path = "#{drive}:#{slash}Program Files"
           instance = instance(path)
-          instance[@param].should == path
+          expect(instance[@param]).to eq(path)
         end
       end
     end
@@ -153,7 +153,7 @@ shared_examples_for "all path parameters" do |param, options|
     }.each do |name, path|
       it "should accept #{name} as absolute" do
         instance = instance(path)
-        instance[@param].should == path
+        expect(instance[@param]).to eq(path)
       end
     end
   end

data/spec/shared_behaviours/store_configs_terminus.rb

@@ -7,15 +7,15 @@ shared_examples_for "a StoreConfigs terminus" do
   api = [:find, :search, :save, :destroy, :head]
 
   api.each do |name|
-    it { should respond_to name }
+    it { is_expected.to respond_to(name) }
   end
 
   it "should fail if an invalid backend is configured" do
     Puppet[:storeconfigs_backend] = "synergy"
-    expect { subject }.to raise_error ArgumentError, /could not find terminus synergy/i
+    expect { subject }.to raise_error(ArgumentError, /could not find terminus synergy/i)
   end
 
   it "should wrap the declared backend" do
-    subject.target.class.name.should == :store_configs_testing
+    expect(subject.target.class.name).to eq(:store_configs_testing)
   end
 end

data/spec/shared_behaviours/things_that_declare_options.rb

@@ -2,7 +2,7 @@
 shared_examples_for "things that declare options" do
   it "should support options without arguments" do
     thing = add_options_to { option "--bar" }
-    thing.should be_option :bar
+    expect(thing).to be_option :bar
   end
 
   it "should support options with an empty block" do
@@ -11,14 +11,14 @@ shared_examples_for "things that declare options" do
         # this section deliberately left blank
       end
     end
-    thing.should be
-    thing.should be_option :foo
+    expect(thing).to be
+    expect(thing).to be_option :foo
   end
 
   { "--foo=" => :foo }.each do |input, option|
     it "should accept #{name.inspect}" do
       thing = add_options_to { option input }
-      thing.should be_option option
+      expect(thing).to be_option option
     end
   end
 
@@ -32,7 +32,7 @@ shared_examples_for "things that declare options" do
       end
     end
 
-    thing.get_option(:foo).description.should == text
+    expect(thing.get_option(:foo).description).to eq(text)
   end
 
   it "should list all the options" do
@@ -43,7 +43,7 @@ shared_examples_for "things that declare options" do
       option "-f"
       option "--baz"
     end
-    thing.options.should == [:foo, :bar, :quux, :f, :baz]
+    expect(thing.options).to eq([:foo, :bar, :quux, :f, :baz])
   end
 
   it "should detect conflicts in long options" do
@@ -103,7 +103,7 @@ shared_examples_for "things that declare options" do
     expect do
       thing = add_options_to do option "--foo=[baz]", "--bar=[baz]" end
       [:foo, :bar].each do |name|
-        thing.should be_option name
+        expect(thing).to be_option name
       end
     end.to raise_error(ArgumentError, /optional arguments are not supported/)
   end
@@ -111,12 +111,12 @@ shared_examples_for "things that declare options" do
   describe "#takes_argument?" do
     it "should detect an argument being absent" do
       thing = add_options_to do option "--foo" end
-      thing.get_option(:foo).should_not be_takes_argument
+      expect(thing.get_option(:foo)).not_to be_takes_argument
     end
     ["=FOO", " FOO"].each do |input|
       it "should detect an argument given #{input.inspect}" do
         thing = add_options_to do option "--foo#{input}" end
-        thing.get_option(:foo).should be_takes_argument
+        expect(thing.get_option(:foo)).to be_takes_argument
       end
     end
   end
@@ -124,15 +124,15 @@ shared_examples_for "things that declare options" do
   describe "#optional_argument?" do
     it "should be false if no argument is present" do
       option = add_options_to do option "--foo" end.get_option(:foo)
-      option.should_not be_takes_argument
-      option.should_not be_optional_argument
+      expect(option).not_to be_takes_argument
+      expect(option).not_to be_optional_argument
     end
 
     ["=FOO", " FOO"].each do |input|
       it "should be false if the argument is mandatory (like #{input.inspect})" do
         option = add_options_to do option "--foo#{input}" end.get_option(:foo)
-      option.should be_takes_argument
-      option.should_not be_optional_argument
+      expect(option).to be_takes_argument
+      expect(option).not_to be_optional_argument
       end
     end
 
@@ -140,8 +140,8 @@ shared_examples_for "things that declare options" do
       it "should fail if the argument is optional (like #{input.inspect})" do
         expect do
           option = add_options_to do option "--foo#{input}" end.get_option(:foo)
-          option.should be_takes_argument
-          option.should be_optional_argument
+          expect(option).to be_takes_argument
+          expect(option).to be_optional_argument
         end.to raise_error(ArgumentError, /optional arguments are not supported/)
       end
     end
@@ -150,7 +150,7 @@ shared_examples_for "things that declare options" do
   describe "#default_to" do
     it "should not have a default value by default" do
       option = add_options_to do option "--foo" end.get_option(:foo)
-      option.should_not be_has_default
+      expect(option).not_to be_has_default
     end
 
     it "should accept a block for the default value" do
@@ -162,7 +162,7 @@ shared_examples_for "things that declare options" do
         end
       end.get_option(:foo)
 
-      option.should be_has_default
+      expect(option).to be_has_default
     end
 
     it "should invoke the block when asked for the default value" do
@@ -175,9 +175,9 @@ shared_examples_for "things that declare options" do
         end
       end.get_option(:foo)
 
-      option.should be_has_default
-      option.default.should be_true
-      invoked.should be_true
+      expect(option).to be_has_default
+      expect(option.default).to be_truthy
+      expect(invoked).to be_truthy
     end
 
     it "should return the value of the block when asked for the default" do
@@ -189,8 +189,8 @@ shared_examples_for "things that declare options" do
         end
       end.get_option(:foo)
 
-      option.should be_has_default
-      option.default.should == 12
+      expect(option).to be_has_default
+      expect(option.default).to eq(12)
     end
 
     it "should invoke the block every time the default is requested" do
@@ -206,9 +206,9 @@ shared_examples_for "things that declare options" do
       second = option.default.object_id
       third  = option.default.object_id
 
-      first.should_not == second
-      first.should_not == third
-      second.should_not == third
+      expect(first).not_to eq(second)
+      expect(first).not_to eq(third)
+      expect(second).not_to eq(third)
     end
 
     it "should fail if the option has a default and is required" do

data/spec/shared_contexts/checksum.rb

@@ -0,0 +1,62 @@
+# Shared contexts for testing against all supported checksum types.
+#
+# These helpers define nested rspec example groups to test code against all our
+# supported checksum types. Example groups that need to be run against all
+# types should use the `with_checksum_types` helper which will
+# create a new example group for each types and will run the given block
+# in each example group.
+
+CHECKSUM_PLAINTEXT = "1\r\n"*4000
+CHECKSUM_TYPES_TO_TRY = [
+  ['md5', 'a7a169ac84bb863b30484d0aa03139c1'],
+  ['md5lite', '22b4182363e81b326e98231fde616782'],
+  ['sha256', '47fcae62967db2fb5cba2fc0d9cf3e6767035d763d825ecda535a7b1928b9746'],
+  ['sha256lite', 'fd50217a2b0286ba25121bf2297bbe6c197933992de67e4e568f19861444ecf8']
+]
+
+CHECKSUM_STAT_TIME = Time.now
+TIME_TYPES_TO_TRY = [
+  ['ctime', "#{CHECKSUM_STAT_TIME}"],
+  ['mtime', "#{CHECKSUM_STAT_TIME}"]
+]
+
+shared_context('with supported checksum types') do
+  def self.with_checksum_types(path, file, &block)
+    def checksum_valid(checksum_type, expected_checksum, actual_checksum_signature)
+      case checksum_type
+      when 'mtime', 'ctime'
+        expect(DateTime.parse(actual_checksum_signature)).to be >= DateTime.parse(expected_checksum)
+      else
+        expect(actual_checksum_signature).to eq("{#{checksum_type}}#{expected_checksum}")
+      end
+    end
+
+    def expect_correct_checksum(meta, checksum_type, checksum, type)
+      expect(meta).to_not be_nil
+      expect(meta).to be_instance_of(type)
+      expect(meta.checksum_type).to eq(checksum_type)
+      expect(checksum_valid(checksum_type, checksum, meta.checksum)).to be_truthy
+    end
+
+    (CHECKSUM_TYPES_TO_TRY + TIME_TYPES_TO_TRY).each do |checksum_type, checksum|
+      describe("when checksum_type is #{checksum_type}") do
+        let(:checksum_type) { checksum_type }
+        let(:plaintext) { CHECKSUM_PLAINTEXT }
+        let(:checksum) { checksum }
+        let(:env_path) { tmpfile(path) }
+        let(:checksum_file) { File.join(env_path, file) }
+
+        def digest(content)
+          Puppet::Util::Checksums.send(checksum_type, content)
+        end
+
+        before(:each) do
+          FileUtils.mkdir_p(File.dirname(checksum_file))
+          File.open(checksum_file, "wb") { |f| f.write plaintext }
+        end
+
+        instance_eval(&block)
+      end
+    end
+  end
+end

data/spec/shared_contexts/{checksums.rb → digests.rb}

@@ -2,14 +2,14 @@
 #
 # These helpers define nested rspec example groups to test code against all our
 # supported digest algorithms. Example groups that need to be run against all
-# algorithms should use the `using_checksums_describe` helper which will
+# algorithms should use the `with_digest_algorithms` helper which will
 # create a new example group for each algorithm and will run the given block
 # in each example group.
 #
 # For each algorithm a shared context is defined for the given algorithm that
 # has precomputed checksum values and paths. These contexts are included
 # automatically based on the rspec metadata selected with
-# `using_checksums_describe`.
+# `with_digest_algorithms`.
 
 DIGEST_ALGORITHMS_TO_TRY = ['md5', 'sha256']
 

data/spec/spec_helper.rb

@@ -14,8 +14,10 @@ rescue LoadError
 end
 
 require 'puppet'
-gem 'rspec', '>=2.0.0'
+gem 'rspec', '>=3.1.0'
 require 'rspec/expectations'
+require 'rspec/its'
+require 'rspec/collection_matchers'
 
 # So everyone else doesn't have to include this base constant.
 module PuppetSpec
@@ -31,8 +33,6 @@ require 'puppet_spec/files'
 require 'puppet_spec/settings'
 require 'puppet_spec/fixtures'
 require 'puppet_spec/matchers'
-require 'puppet_spec/database'
-require 'monkey_patches/alias_should_to_must'
 require 'puppet/test/test_helper'
 
 Pathname.glob("#{dir}/shared_contexts/*.rb") do |file|
@@ -99,7 +99,7 @@ RSpec.configure do |config|
     Puppet::Test::TestHelper.after_all_tests()
   end
 
-  config.before :each do
+  config.before :each do |test|
     # Disabling garbage collection inside each test, and only running it at
     # the end of each block, gives us an ~ 15 percent speedup, and more on
     # some platforms *cough* windows *cough* that are a little slower.
@@ -121,6 +121,14 @@ RSpec.configure do |config|
     # redirecting logging away from console, because otherwise the test output will be
     #  obscured by all of the log output
     @logs = []
+    if ENV["PUPPET_TEST_LOG_LEVEL"]
+      Puppet::Util::Log.level = ENV["PUPPET_TEST_LOG_LEVEL"].intern
+    end
+    if ENV["PUPPET_TEST_LOG"]
+      Puppet::Util::Log.newdestination(ENV["PUPPET_TEST_LOG"])
+      m = test.metadata
+      Puppet.notice("*** BEGIN TEST #{m[:file_path]}:#{m[:line_number]}")
+    end
     Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs))
 
     @log_level = Puppet::Util::Log.level
@@ -128,6 +136,7 @@ RSpec.configure do |config|
     base = PuppetSpec::Files.tmpdir('tmp_settings')
     Puppet[:vardir] = File.join(base, 'var')
     Puppet[:confdir] = File.join(base, 'etc')
+    Puppet[:codedir] = File.join(base, 'code')
     Puppet[:logdir] = "$vardir/log"
     Puppet[:rundir] = "$vardir/run"
     Puppet[:hiera_config] = File.join(base, 'hiera')
@@ -175,7 +184,7 @@ RSpec.configure do |config|
 
     def profile
       result = RubyProf.profile { yield }
-      name = example.metadata[:full_description].downcase.gsub(/[^a-z0-9_-]/, "-").gsub(/-+/, "-")
+      name = RSpec.current_example.metadata[:full_description].downcase.gsub(/[^a-z0-9_-]/, "-").gsub(/-+/, "-")
       printer = RubyProf::CallTreePrinter.new(result)
       open(File.join(ENV['PROFILEOUT'],"callgrind.#{name}.#{Time.now.to_i}.trace"), "w") do |f|
         printer.print(f)