puppet 6.0.10-x86-mingw32 → 6.1.0-x86-mingw32

data/spec/unit/util/splayer_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/splayer'
 
@@ -13,31 +14,31 @@ describe Puppet::Util::Splayer do
 
   it "should do nothing if splay is disabled" do
     Puppet[:splay] = false
-    expect(subject).not_to receive(:sleep)
+    subject.expects(:sleep).never
     subject.splay
   end
 
   it "should do nothing if it has already splayed" do
-    expect(subject).to receive(:splayed?).and_return(true)
-    expect(subject).not_to receive(:sleep)
+    subject.expects(:splayed?).returns true
+    subject.expects(:sleep).never
     subject.splay
   end
 
   it "should log that it is splaying" do
-    allow(subject).to receive(:sleep)
-    expect(Puppet).to receive(:info)
+    subject.stubs :sleep
+    Puppet.expects :info
     subject.splay
   end
 
   it "should sleep for a random portion of the splaylimit plus 1" do
     Puppet[:splaylimit] = "50"
-    expect(subject).to receive(:rand).with(51).and_return(10)
-    expect(subject).to receive(:sleep).with(10)
+    subject.expects(:rand).with(51).returns 10
+    subject.expects(:sleep).with(10)
     subject.splay
   end
 
   it "should mark that it has splayed" do
-    allow(subject).to receive(:sleep)
+    subject.stubs(:sleep)
     subject.splay
     expect(subject).to be_splayed
   end

data/spec/unit/util/ssl_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'openssl'

data/spec/unit/util/storage_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'yaml'
@@ -67,7 +68,7 @@ describe Puppet::Util::Storage do
 
   describe "when loading from the state file" do
     before do
-      allow(Puppet.settings).to receive(:use).and_return(true)
+      Puppet.settings.stubs(:use).returns(true)
     end
 
     describe "when the state file/directory does not exist" do
@@ -145,7 +146,7 @@ describe Puppet::Util::Storage do
       it "should raise an error if the state file does not contain valid YAML and cannot be renamed" do
         write_state_file('{ invalid')
 
-        expect(File).to receive(:rename).and_raise(SystemCallError)
+        File.expects(:rename).raises(SystemCallError)
 
         expect { Puppet::Util::Storage.load }.to raise_error(Puppet::Error, /Could not rename/)
       end
@@ -153,7 +154,7 @@ describe Puppet::Util::Storage do
       it "should attempt to rename the state file if the file is corrupted" do
         write_state_file('{ invalid')
 
-        expect(File).to receive(:rename).at_least(:once)
+        File.expects(:rename).at_least_once
 
         Puppet::Util::Storage.load
       end
@@ -180,8 +181,6 @@ describe Puppet::Util::Storage do
   end
 
   describe "when storing to the state file" do
-    A_SMALL_AMOUNT_OF_TIME = 0.001 #Seconds
-
     before(:each) do
       @state_file = tmpfile('storage_test')
       @saved_statefile = Puppet[:statefile]
@@ -233,13 +232,13 @@ describe Puppet::Util::Storage do
       stale_checked = recent_checked - (Puppet[:statettl] + 10)
       Puppet::Util::Storage.cache(:yayness)[:checked] = recent_checked
       Puppet::Util::Storage.cache(:stale)[:checked] = stale_checked
-      expect(Puppet::Util::Storage.state).to match(
+      expect(Puppet::Util::Storage.state).to eq(
         {
           :yayness => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(recent_checked)
+            :checked => recent_checked
           },
           :stale => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(stale_checked)
+            :checked => stale_checked
           }
         }
       )
@@ -251,28 +250,29 @@ describe Puppet::Util::Storage do
 
       Puppet::Util::Storage.load
 
-      expect(Puppet::Util::Storage.state).to match(
+      expect(Puppet::Util::Storage.state).to eq(
         {
           :yayness => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(recent_checked)
+            :checked => recent_checked
           }
         }
       )
     end
 
+
     it "does not expire entries when statettl is 0" do
       Puppet[:statettl] = '0'
       recent_checked = Time.now.round
       older_checked = recent_checked - 10_000_000
       Puppet::Util::Storage.cache(:yayness)[:checked] = recent_checked
       Puppet::Util::Storage.cache(:older)[:checked] = older_checked
-      expect(Puppet::Util::Storage.state).to match(
+      expect(Puppet::Util::Storage.state).to eq(
         {
           :yayness => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(recent_checked)
+            :checked => recent_checked
           },
           :older => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(older_checked)
+            :checked => older_checked
           }
         }
       )
@@ -284,31 +284,32 @@ describe Puppet::Util::Storage do
 
       Puppet::Util::Storage.load
 
-      expect(Puppet::Util::Storage.state).to match(
+      expect(Puppet::Util::Storage.state).to eq(
         {
           :yayness => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(recent_checked)
+            :checked => recent_checked
           },
           :older => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(older_checked)
+            :checked => older_checked
           }
         }
       )
     end
 
+
     it "does not expire entries when statettl is 'unlimited'" do
       Puppet[:statettl] = 'unlimited'
       recent_checked = Time.now
       older_checked = Time.now - 10_000_000
       Puppet::Util::Storage.cache(:yayness)[:checked] = recent_checked
       Puppet::Util::Storage.cache(:older)[:checked] = older_checked
-      expect(Puppet::Util::Storage.state).to match(
+      expect(Puppet::Util::Storage.state).to eq(
         {
           :yayness => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(recent_checked)
+            :checked => recent_checked
           },
           :older => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(older_checked)
+            :checked => older_checked
           }
         }
       )
@@ -320,13 +321,13 @@ describe Puppet::Util::Storage do
 
       Puppet::Util::Storage.load
 
-      expect(Puppet::Util::Storage.state).to match(
+      expect(Puppet::Util::Storage.state).to eq(
         {
           :yayness => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(recent_checked)
+            :checked => recent_checked
           },
           :older => {
-            :checked => a_value_within(A_SMALL_AMOUNT_OF_TIME).of(older_checked)
+            :checked => older_checked
           }
         }
       )

data/spec/unit/util/suidmanager_spec.rb

@@ -1,3 +1,5 @@
+#! /usr/bin/env ruby
+
 require 'spec_helper'
 
 describe Puppet::Util::SUIDManager do
@@ -10,18 +12,18 @@ describe Puppet::Util::SUIDManager do
   end
 
   before :each do
-    allow(Puppet::Util::SUIDManager).to receive(:convert_xid).and_return(42)
-    pwent = double('pwent', :name => 'fred', :uid => 42, :gid => 42)
-    allow(Etc).to receive(:getpwuid).with(42).and_return(pwent)
+    Puppet::Util::SUIDManager.stubs(:convert_xid).returns(42)
+    pwent = stub('pwent', :name => 'fred', :uid => 42, :gid => 42)
+    Etc.stubs(:getpwuid).with(42).returns(pwent)
 
     [:euid, :egid, :uid, :gid, :groups].each do |id|
-      allow(Process).to receive("#{id}=") {|value| xids[id] = value}
+      Process.stubs("#{id}=").with {|value| xids[id] = value }
     end
   end
 
   describe "#initgroups" do
     it "should use the primary group of the user as the 'basegid'" do
-      expect(Process).to receive(:initgroups).with('fred', 42)
+      Process.expects(:initgroups).with('fred', 42)
       described_class.initgroups(42)
     end
   end
@@ -38,11 +40,11 @@ describe Puppet::Util::SUIDManager do
 
   describe "#asuser" do
     it "should not get or set euid/egid when not root" do
-      allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
-      allow(Process).to receive(:uid).and_return(1)
+      Puppet::Util::Platform.stubs(:windows?).returns false
+      Process.stubs(:uid).returns(1)
 
-      allow(Process).to receive(:egid).and_return(51)
-      allow(Process).to receive(:euid).and_return(50)
+      Process.stubs(:egid).returns(51)
+      Process.stubs(:euid).returns(50)
 
       Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) {}
 
@@ -51,17 +53,17 @@ describe Puppet::Util::SUIDManager do
 
     context "when root and not windows" do
       before :each do
-        allow(Process).to receive(:uid).and_return(0)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+        Process.stubs(:uid).returns(0)
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       it "should set euid/egid" do
-        allow(Process).to receive(:egid).and_return(51, 51, user[:gid])
-        allow(Process).to receive(:euid).and_return(50, 50, user[:uid])
+        Process.stubs(:egid).returns(51).then.returns(51).then.returns(user[:gid])
+        Process.stubs(:euid).returns(50).then.returns(50).then.returns(user[:uid])
 
-        allow(Puppet::Util::SUIDManager).to receive(:convert_xid).with(:gid, 51).and_return(51)
-        allow(Puppet::Util::SUIDManager).to receive(:convert_xid).with(:uid, 50).and_return(50)
-        allow(Puppet::Util::SUIDManager).to receive(:initgroups).and_return([])
+        Puppet::Util::SUIDManager.stubs(:convert_xid).with(:gid, 51).returns(51)
+        Puppet::Util::SUIDManager.stubs(:convert_xid).with(:uid, 50).returns(50)
+        Puppet::Util::SUIDManager.stubs(:initgroups).returns([])
 
         yielded = false
         Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) do
@@ -93,7 +95,7 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should change gid to the primary group of uid by default" do
-        allow(Process).to receive(:initgroups)
+        Process.stubs(:initgroups)
 
         yielded = false
         Puppet::Util::SUIDManager.asuser(42) { yielded = true }
@@ -105,10 +107,13 @@ describe Puppet::Util::SUIDManager do
         # I don't like the sequence, but it is the only way to assert on the
         # internal behaviour in a reliable fashion, given we need multiple
         # sequenced calls to the same methods. --daniel 2012-02-05
-        expect(Puppet::Util::SUIDManager).to receive(:change_group).with(43, false).ordered()
-        expect(Puppet::Util::SUIDManager).to receive(:change_user).with(42, false).ordered()
-        expect(Puppet::Util::SUIDManager).to receive(:change_group).with(Puppet::Util::SUIDManager.egid, false).ordered()
-        expect(Puppet::Util::SUIDManager).to receive(:change_user).with(Puppet::Util::SUIDManager.euid, false).ordered()
+        horror = sequence('of user and group changes')
+        Puppet::Util::SUIDManager.expects(:change_group).with(43, false).in_sequence(horror)
+        Puppet::Util::SUIDManager.expects(:change_user).with(42, false).in_sequence(horror)
+        Puppet::Util::SUIDManager.expects(:change_group).
+          with(Puppet::Util::SUIDManager.egid, false).in_sequence(horror)
+        Puppet::Util::SUIDManager.expects(:change_user).
+          with(Puppet::Util::SUIDManager.euid, false).in_sequence(horror)
 
         yielded = false
         Puppet::Util::SUIDManager.asuser(42, 43) { yielded = true }
@@ -126,7 +131,7 @@ describe Puppet::Util::SUIDManager do
   describe "#change_group" do
     describe "when changing permanently" do
       it "should change_privilege" do
-        expect(Process::GID).to receive(:change_privilege) do |gid|
+        Process::GID.expects(:change_privilege).with do |gid|
           Process.gid = gid
           Process.egid = gid
         end
@@ -138,7 +143,7 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should not change_privilege when gid already matches" do
-        expect(Process::GID).to receive(:change_privilege) do |gid|
+        Process::GID.expects(:change_privilege).with do |gid|
           Process.gid = 42
           Process.egid = 42
         end
@@ -163,26 +168,25 @@ describe Puppet::Util::SUIDManager do
   describe "#change_user" do
     describe "when changing permanently" do
       it "should change_privilege" do
-        expect(Process::UID).to receive(:change_privilege) do |uid|
+        Process::UID.expects(:change_privilege).with do |uid|
           Process.uid = uid
           Process.euid = uid
         end
 
-        expect(Puppet::Util::SUIDManager).to receive(:initgroups).with(42)
+        Puppet::Util::SUIDManager.expects(:initgroups).with(42)
 
         Puppet::Util::SUIDManager.change_user(42, true)
 
         expect(xids[:euid]).to eq(42)
         expect(xids[:uid]).to eq(42)
       end
-
       it "should not change_privilege when uid already matches" do
-        expect(Process::UID).to receive(:change_privilege) do |uid|
+        Process::UID.expects(:change_privilege).with do |uid|
           Process.uid = 42
           Process.euid = 42
         end
 
-        expect(Puppet::Util::SUIDManager).to receive(:initgroups).with(42)
+        Puppet::Util::SUIDManager.expects(:initgroups).with(42)
 
         Puppet::Util::SUIDManager.change_user(42, true)
 
@@ -193,7 +197,7 @@ describe Puppet::Util::SUIDManager do
 
     describe "when changing temporarily" do
       it "should change only euid and groups" do
-        allow(Puppet::Util::SUIDManager).to receive(:initgroups).and_return([])
+        Puppet::Util::SUIDManager.stubs(:initgroups).returns([])
         Puppet::Util::SUIDManager.change_user(42, false)
 
         expect(xids[:euid]).to eq(42)
@@ -201,19 +205,23 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should set euid before groups if changing to root" do
-        allow(Process).to receive(:euid).and_return(50)
+        Process.stubs(:euid).returns 50
+
+        when_not_root = sequence 'when_not_root'
 
-        expect(Process).to receive(:euid=).ordered()
-        expect(Puppet::Util::SUIDManager).to receive(:initgroups).ordered()
+        Process.expects(:euid=).in_sequence(when_not_root)
+        Puppet::Util::SUIDManager.expects(:initgroups).in_sequence(when_not_root)
 
         Puppet::Util::SUIDManager.change_user(0, false)
       end
 
       it "should set groups before euid if changing from root" do
-        allow(Process).to receive(:euid).and_return(0)
+        Process.stubs(:euid).returns 0
 
-        expect(Puppet::Util::SUIDManager).to receive(:initgroups).ordered()
-        expect(Process).to receive(:euid=).ordered()
+        when_root = sequence 'when_root'
+
+        Puppet::Util::SUIDManager.expects(:initgroups).in_sequence(when_root)
+        Process.expects(:euid=).in_sequence(when_root)
 
         Puppet::Util::SUIDManager.change_user(50, false)
       end
@@ -223,18 +231,18 @@ describe Puppet::Util::SUIDManager do
   describe "#root?" do
     describe "on POSIX systems" do
       before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(true)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+        Puppet.features.stubs(:posix?).returns(true)
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       it "should be root if uid is 0" do
-        allow(Process).to receive(:uid).and_return(0)
+        Process.stubs(:uid).returns(0)
 
         expect(Puppet::Util::SUIDManager).to be_root
       end
 
       it "should not be root if uid is not 0" do
-        allow(Process).to receive(:uid).and_return(1)
+        Process.stubs(:uid).returns(1)
 
         expect(Puppet::Util::SUIDManager).not_to be_root
       end
@@ -242,13 +250,13 @@ describe Puppet::Util::SUIDManager do
 
     describe "on Microsoft Windows", :if => Puppet::Util::Platform.windows? do
       it "should be root if user is privileged" do
-        allow(Puppet::Util::Windows::User).to receive(:admin?).and_return(true)
+        Puppet::Util::Windows::User.stubs(:admin?).returns true
 
         expect(Puppet::Util::SUIDManager).to be_root
       end
 
       it "should not be root if user is not privileged" do
-        allow(Puppet::Util::Windows::User).to receive(:admin?).and_return(false)
+        Puppet::Util::Windows::User.stubs(:admin?).returns false
 
         expect(Puppet::Util::SUIDManager).not_to be_root
       end
@@ -261,15 +269,16 @@ describe 'Puppet::Util::SUIDManager#groups=' do
     Puppet::Util::SUIDManager
   end
 
+
   it "(#3419) should rescue Errno::EINVAL on OS X" do
-    expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
-    expect(subject).to receive(:osx_maj_ver).and_return('10.7').twice
+    Process.expects(:groups=).raises(Errno::EINVAL, 'blew up')
+    subject.expects(:osx_maj_ver).returns('10.7').twice
     subject.groups = ['list', 'of', 'groups']
   end
 
   it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X" do
-    expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
-    expect(subject).to receive(:osx_maj_ver).and_return(false)
+    Process.expects(:groups=).raises(Errno::EINVAL, 'blew up')
+    subject.expects(:osx_maj_ver).returns(false)
     expect { subject.groups = ['list', 'of', 'groups'] }.to raise_error(Errno::EINVAL)
   end
 end

data/spec/unit/util/symbolic_file_mode_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/symbolic_file_mode'

data/spec/unit/util/tag_set_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/tag_set'

data/spec/unit/util/tagging_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 # coding: utf-8
 require 'spec_helper'