puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/spec/unit/provider/package/windows/package_spec.rb

@@ -32,7 +32,7 @@ describe Puppet::Provider::Package::Windows::Package do
     end
   end
 
-  context '::with_key' do
+  context '::with_key', :if => Puppet.features.microsoft_windows? do
     it 'should search HKLM (64 & 32) and HKCU (64 & 32)' do
       seq = sequence('reg')
 
@@ -44,8 +44,8 @@ describe Puppet::Provider::Package::Windows::Package do
       subject.with_key { |key, values| }
     end
 
-    it 'should ignore file not found exceptions', :if => Puppet.features.microsoft_windows? do
-      ex = Puppet::Util::Windows::Error.new('Failed to open registry key', Windows::Error::ERROR_FILE_NOT_FOUND)
+    it 'should ignore file not found exceptions' do
+      ex = Puppet::Util::Windows::Error.new('Failed to open registry key', Puppet::Util::Windows::Error::ERROR_FILE_NOT_FOUND)
 
       # make sure we don't stop after the first exception
       subject.expects(:open).times(4).raises(ex)
@@ -55,13 +55,13 @@ describe Puppet::Provider::Package::Windows::Package do
       keys.should be_empty
     end
 
-    it 'should raise other types of exceptions', :if => Puppet.features.microsoft_windows? do
-      ex = Puppet::Util::Windows::Error.new('Failed to open registry key', Windows::Error::ERROR_ACCESS_DENIED)
+    it 'should raise other types of exceptions' do
+      ex = Puppet::Util::Windows::Error.new('Failed to open registry key', Puppet::Util::Windows::Error::ERROR_ACCESS_DENIED)
       subject.expects(:open).raises(ex)
 
       expect {
         subject.with_key{ |key, values| }
-      }.to raise_error(Puppet::Error, /Access is denied/)
+      }.to raise_error(Puppet::Util::Windows::Error, /Access is denied/)
     end
   end
 
@@ -103,6 +103,21 @@ describe Puppet::Provider::Package::Windows::Package do
     end
   end
 
+  context '::munge' do
+    it 'should shell quote strings with spaces and fix forward slashes' do
+      subject.munge('c:/windows/the thing').should == '"c:\windows\the thing"'
+    end
+    it 'should leave properly formatted paths alone' do
+      subject.munge('c:\windows\thething').should == 'c:\windows\thething'
+    end
+  end
+
+  context '::replace_forward_slashes' do
+    it 'should replace forward with back slashes' do
+      subject.replace_forward_slashes('c:/windows/thing/stuff').should == 'c:\windows\thing\stuff'
+    end
+  end
+
   context '::quote' do
     it 'should shell quote strings with spaces' do
       subject.quote('foo bar').should == '"foo bar"'

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

@@ -81,6 +81,7 @@ describe provider_class do
       resource[:ensure] = :installed
       resource[:install_options] = ['-t', {'-x' => 'expackage'}]
 
+      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', ['-t', '-x=expackage'], :list, name)
       provider.expects(:yum).with('-d', '0', '-e', '0', '-y', ['-t', '-x=expackage'], :install, name)
       provider.install
     end

data/spec/unit/provider/parsedfile_spec.rb

@@ -108,7 +108,7 @@ describe Puppet::Provider::ParsedFile do
       provider.prefetch
 
       @filetype = Puppet::Util::FileType.filetype(:flat).new("/my/file")
-      Puppet::Util::FileType.filetype(:flat).stubs(:new).with("/my/file").returns @filetype
+      Puppet::Util::FileType.filetype(:flat).stubs(:new).with("/my/file",nil).returns @filetype
 
       @filetype.stubs(:write)
     end

data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
-require 'win32/taskscheduler' if Puppet.features.microsoft_windows?
+require 'puppet/util/windows/taskscheduler' if Puppet.features.microsoft_windows?
 
 shared_examples_for "a trigger that handles start_date and start_time" do
   let(:trigger) do
@@ -569,27 +569,27 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
     let(:resource) { described_class.new(:name => 'foobar', :command => 'C:\Windows\System32\notepad.exe') }
 
     it 'should consider the user as in sync if the name matches' do
-      Puppet::Util::Windows::Security.expects(:name_to_sid).with('joe').twice.returns('SID A')
+      Puppet::Util::Windows::SID.expects(:name_to_sid).with('joe').twice.returns('SID A')
 
       resource.should be_user_insync('joe', ['joe'])
     end
 
     it 'should consider the user as in sync if the current user is fully qualified' do
-      Puppet::Util::Windows::Security.expects(:name_to_sid).with('joe').returns('SID A')
-      Puppet::Util::Windows::Security.expects(:name_to_sid).with('MACHINE\joe').returns('SID A')
+      Puppet::Util::Windows::SID.expects(:name_to_sid).with('joe').returns('SID A')
+      Puppet::Util::Windows::SID.expects(:name_to_sid).with('MACHINE\joe').returns('SID A')
 
       resource.should be_user_insync('MACHINE\joe', ['joe'])
     end
 
     it 'should consider a current user of the empty string to be the same as the system user' do
-      Puppet::Util::Windows::Security.expects(:name_to_sid).with('system').twice.returns('SYSTEM SID')
+      Puppet::Util::Windows::SID.expects(:name_to_sid).with('system').twice.returns('SYSTEM SID')
 
       resource.should be_user_insync('', ['system'])
     end
 
     it 'should consider different users as being different' do
-      Puppet::Util::Windows::Security.expects(:name_to_sid).with('joe').returns('SID A')
-      Puppet::Util::Windows::Security.expects(:name_to_sid).with('bob').returns('SID B')
+      Puppet::Util::Windows::SID.expects(:name_to_sid).with('joe').returns('SID A')
+      Puppet::Util::Windows::SID.expects(:name_to_sid).with('bob').returns('SID B')
 
       resource.should_not be_user_insync('joe', ['bob'])
     end
@@ -1469,7 +1469,7 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
       end
 
       it 'should use nil for user and password when setting the user to the SYSTEM account' do
-        Puppet::Util::Windows::Security.stubs(:name_to_sid).with('system').returns('SYSTEM SID')
+        Puppet::Util::Windows::SID.stubs(:name_to_sid).with('system').returns('SYSTEM SID')
 
         resource = Puppet::Type.type(:scheduled_task).new(
           :name    => 'Test Task',
@@ -1483,7 +1483,7 @@ describe Puppet::Type.type(:scheduled_task).provider(:win32_taskscheduler), :if
       end
 
       it 'should use the specified user and password when setting the user to anything other than SYSTEM' do
-        Puppet::Util::Windows::Security.stubs(:name_to_sid).with('my_user_name').returns('SID A')
+        Puppet::Util::Windows::SID.stubs(:name_to_sid).with('my_user_name').returns('SID A')
 
         resource = Puppet::Type.type(:scheduled_task).new(
           :name     => 'Test Task',

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

@@ -173,13 +173,13 @@ describe provider_class 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'])
+      provider.pkg_scripts_append.should === ['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'])
+      provider.pkg_scripts_append.should === ['cupsd', 'dbus_daemon']
     end
   end
 
@@ -210,6 +210,22 @@ describe provider_class do
       output = provider.set_content_flags(content,"-d")
       output.should match_array(['cupsd_flags="-d"'])
     end
+
+    it "does not set empty flags for package scripts" do
+      content = []
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'cupsd'))
+      provider.expects(:in_base?).returns(false)
+      output = provider.set_content_flags(content,'')
+      output.should match_array([nil])
+    end
+
+    it "does set empty flags for base scripts" do
+      content = []
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'ntpd'))
+      provider.expects(:in_base?).returns(true)
+      output = provider.set_content_flags(content,'')
+      output.should match_array(['ntpd_flags=""'])
+    end
   end
 
   describe "#remove_content_flags" do
@@ -229,4 +245,12 @@ describe provider_class do
       provider.set_content_scripts(content,scripts).should match_array(['pkg_scripts="dbus_daemon cupsd"'])
     end
   end
+
+  describe "#in_base?" do
+    it "should true if in base" do
+      File.stubs(:readlines).with('/etc/rc.conf').returns(['sshd_flags=""'])
+      provider = described_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
+      provider.in_base?.should be_true
+    end
+  end
 end

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

@@ -22,6 +22,11 @@ describe Puppet::Type.type(:service).provider(:upstart) do
     provider_class.stubs(:which).with("/sbin/initctl").returns("/sbin/initctl")
   end
 
+  it "should be the default provider on Ubuntu" do
+    Facter.expects(:value).with(:operatingsystem).returns("Ubuntu")
+    described_class.default?.should be_true
+  end
+
   describe "excluding services" do
     it "ignores tty and serial on Redhat systems" do
       Facter.stubs(:value).with(:osfamily).returns('RedHat')
@@ -50,7 +55,13 @@ 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\nidmapd-mounting stop/waiting\nstartpar-bridge start/running"
+      processes = "wait-for-state stop/waiting"
+      processes += "\nportmap-wait start/running"
+      processes += "\nidmapd-mounting stop/waiting"
+      processes += "\nstartpar-bridge start/running"
+      processes += "\ncryptdisks-udev stop/waiting"
+      processes += "\nstatd-mounting stop/waiting"
+      processes += "\ngssd-mounting stop/waiting"
       provider_class.stubs(:execpipe).yields(processes)
       provider_class.instances.should be_empty
     end

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

@@ -99,6 +99,12 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     @provider_class.parse_options(optionstr).should == options
   end
 
+  it "should parse quoted options" do
+    line = 'command="/usr/local/bin/mybin \"$SSH_ORIGINAL_COMMAND\"" ssh-rsa xxx mykey'
+
+    @provider_class.parse(line)[0][:options][0].should == 'command="/usr/local/bin/mybin \"$SSH_ORIGINAL_COMMAND\""'
+  end
+
   it "should use '' as name for entries that lack a comment" do
     line = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAut8aOSxenjOqF527dlsdHWV4MNoAsX14l9M297+SQXaQ5Z3BedIxZaoQthkDALlV/25A1COELrg9J2MqJNQc8Xe9XQOIkBQWWinUlD/BXwoOTWEy8C8zSZPHZ3getMMNhGTBO+q/O+qiJx3y5cA4MTbw2zSxukfWC87qWwcZ64UUlegIM056vPsdZWFclS9hsROVEa57YUMrehQ1EGxT4Z5j6zIopufGFiAPjZigq/vqgcAqhAKP6yu4/gwO6S9tatBeEjZ8fafvj1pmvvIplZeMr96gHE7xS3pEEQqnB3nd4RY7AF6j9kFixnsytAUO7STPh/M3pLiVQBN89TvWPQ=="
 

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

@@ -317,7 +317,7 @@ EOT
   describe "#shadow_entry" do
     it "should return the line for the right user" do
       File.stubs(:readlines).returns(["someuser:!:10:5:20:7:1::\n", "fakeval:*:20:10:30:7:2::\n", "testuser:*:30:15:40:7:3::\n"])
-      provider.shadow_entry.should == ["fakeval", "*", "20", "10", "30", "7", "2"]
+      provider.shadow_entry.should == ["fakeval", "*", "20", "10", "30", "7", "2", "", ""]
     end
   end
 
@@ -331,5 +331,27 @@ EOT
       File.stubs(:readlines).returns(["fakeval:NP:12345::::::\n"])
       provider.password_max_age.should == -1
     end
+
+    it "should return -1 for no maximum when failed attempts are present" do
+      File.stubs(:readlines).returns(["fakeval:NP:12345::::::3\n"])
+      provider.password_max_age.should == -1
+    end
+  end
+
+  describe "#password_min_age" do
+    it "should return a minimum age number" do
+      File.stubs(:readlines).returns(["fakeval:NP:12345:10:50::::\n"])
+      provider.password_min_age.should == "10"
+    end
+
+    it "should return -1 for no minimum" do
+      File.stubs(:readlines).returns(["fakeval:NP:12345::::::\n"])
+      provider.password_min_age.should == -1
+    end
+
+    it "should return -1 for no minimum when failed attempts are present" do
+      File.stubs(:readlines).returns(["fakeval:NP:12345::::::3\n"])
+      provider.password_min_age.should == -1
+    end
   end
 end

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Puppet::Type.type(:user).provider(:windows_adsi) do
+describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.features.microsoft_windows? do
   let(:resource) do
     Puppet::Type.type(:user).new(
       :title => 'testuser',
@@ -16,8 +16,8 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
   let(:connection) { stub 'connection' }
 
   before :each do
-    Puppet::Util::ADSI.stubs(:computer_name).returns('testcomputername')
-    Puppet::Util::ADSI.stubs(:connect).returns connection
+    Puppet::Util::Windows::ADSI.stubs(:computer_name).returns('testcomputername')
+    Puppet::Util::Windows::ADSI.stubs(:connect).returns connection
   end
 
   describe ".instances" do
@@ -30,8 +30,8 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
     end
   end
 
-  it "should provide access to a Puppet::Util::ADSI::User object" do
-    provider.user.should be_a(Puppet::Util::ADSI::User)
+  it "should provide access to a Puppet::Util::Windows::ADSI::User object" do
+    provider.user.should be_a(Puppet::Util::Windows::ADSI::User)
   end
 
   describe "when managing groups" do
@@ -68,7 +68,7 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
       resource[:home]       = 'C:\Users\testuser'
 
       user = stub 'user'
-      Puppet::Util::ADSI::User.expects(:create).with('testuser').returns user
+      Puppet::Util::Windows::ADSI::User.expects(:create).with('testuser').returns user
 
       user.stubs(:groups).returns(['group2', 'group3'])
 
@@ -82,12 +82,12 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
       provider.create
     end
 
-    it "should load the profile if managehome is set", :if => Puppet.features.microsoft_windows? do
+    it "should load the profile if managehome is set" do
       resource[:password] = '0xDeadBeef'
       resource[:managehome] = true
 
       user = stub_everything 'user'
-      Puppet::Util::ADSI::User.expects(:create).with('testuser').returns user
+      Puppet::Util::Windows::ADSI::User.expects(:create).with('testuser').returns user
       Puppet::Util::Windows::User.expects(:load_profile).with('testuser', '0xDeadBeef')
 
       provider.create
@@ -115,18 +115,18 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
     end
 
     it 'should not create a user if a group by the same name exists' do
-      Puppet::Util::ADSI::User.expects(:create).with('testuser').raises( Puppet::Error.new("Cannot create user if group 'testuser' exists.") )
+      Puppet::Util::Windows::ADSI::User.expects(:create).with('testuser').raises( Puppet::Error.new("Cannot create user if group 'testuser' exists.") )
       expect{ provider.create }.to raise_error( Puppet::Error,
         /Cannot create user if group 'testuser' exists./ )
     end
   end
 
   it 'should be able to test whether a user exists' do
-    Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
-    Puppet::Util::ADSI.stubs(:connect).returns stub('connection')
+    Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
+    Puppet::Util::Windows::ADSI.stubs(:connect).returns stub('connection')
     provider.should be_exists
 
-    Puppet::Util::ADSI.stubs(:connect).returns nil
+    Puppet::Util::Windows::ADSI.stubs(:connect).returns nil
     provider.should_not be_exists
   end
 
@@ -136,12 +136,12 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
     provider.delete
   end
 
-  it 'should delete the profile if managehome is set', :if => Puppet.features.microsoft_windows? do
+  it 'should delete the profile if managehome is set' do
     resource[:managehome] = true
 
     sid = 'S-A-B-C'
-    Puppet::Util::Windows::Security.expects(:name_to_sid).with('testuser').returns(sid)
-    Puppet::Util::ADSI::UserProfile.expects(:delete).with(sid)
+    Puppet::Util::Windows::SID.expects(:name_to_sid).with('testuser').returns(sid)
+    Puppet::Util::Windows::ADSI::UserProfile.expects(:delete).with(sid)
     connection.expects(:Delete).with('user', 'testuser')
 
     provider.delete
@@ -153,8 +153,8 @@ describe Puppet::Type.type(:user).provider(:windows_adsi) do
     provider.flush
   end
 
-  it "should return the user's SID as uid", :if => Puppet.features.microsoft_windows? do
-    Puppet::Util::Windows::Security.expects(:name_to_sid).with('testuser').returns('S-1-5-21-1362942247-2130103807-3279964888-1111')
+  it "should return the user's SID as uid" do
+    Puppet::Util::Windows::SID.expects(:name_to_sid).with('testuser').returns('S-1-5-21-1362942247-2130103807-3279964888-1111')
 
     provider.uid.should == 'S-1-5-21-1362942247-2130103807-3279964888-1111'
   end

data/spec/unit/reports/store_spec.rb

@@ -30,25 +30,9 @@ describe processor do
       File.read(File.join(Puppet[:reportdir], @report.host, "201101061200.yaml")).should == @report.to_yaml
     end
 
-    it "should write to the report directory in the correct sequence" do
-      # By doing things in this sequence we should protect against race
-      # conditions
-      Time.stubs(:now).returns(Time.parse("2011-01-06 12:00:00 UTC"))
-      writeseq = sequence("write")
-      file = mock "file"
-      Tempfile.expects(:new).in_sequence(writeseq).returns(file)
-      file.expects(:chmod).in_sequence(writeseq).with(0640)
-      file.expects(:print).with(@report.to_yaml).in_sequence(writeseq)
-      file.expects(:close).in_sequence(writeseq)
-      file.stubs(:path).returns(File.join(Dir.tmpdir, "foo123"))
-      FileUtils.expects(:mv).in_sequence(writeseq).with(File.join(Dir.tmpdir, "foo123"), File.join(Puppet[:reportdir], @report.host, "201101061200.yaml"))
-      @report.process
-    end
-
     it "rejects invalid hostnames" do
       @report.host = ".."
       Puppet::FileSystem.expects(:exist?).never
-      Tempfile.expects(:new).never
       expect { @report.process }.to raise_error(ArgumentError, /Invalid node/)
     end
   end

data/spec/unit/resource/catalog_spec.rb

@@ -606,7 +606,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
         @catalog.apply
       end
 
-      after { Puppet.settings.clear }
     end
 
     describe "non-host catalogs" do
@@ -627,7 +626,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
         @catalog.apply
       end
 
-      after { Puppet.settings.clear }
     end
   end
 
@@ -659,9 +657,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.write_graph(@name)
     end
 
-    after do
-      Puppet.settings.clear
-    end
   end
 
   describe "when indirecting" do

data/spec/unit/resource_spec.rb

@@ -592,7 +592,7 @@ describe Puppet::Resource do
       text = @resource.render('yaml')
 
       newresource = Puppet::Resource.convert_from('yaml', text)
-      newresource.should equal_attributes_of @resource
+      newresource.should equal_resource_attributes_of @resource
     end
   end
 
@@ -615,7 +615,7 @@ describe Puppet::Resource do
       text = @resource.render('yaml')
 
       newresource = Puppet::Resource.convert_from('yaml', text)
-      newresource.should equal_attributes_of @resource
+      newresource.should equal_resource_attributes_of @resource
     end
   end
 

data/spec/unit/settings/autosign_setting_spec.rb

@@ -73,7 +73,7 @@ describe Puppet::Settings::AutosignSetting do
   describe "converting the setting to a resource" do
     it "converts the file path to a file resource" do
       path = File.expand_path('/path/to/autosign.conf')
-      settings.stubs(:value).with('autosign').returns(path)
+      settings.stubs(:value).with('autosign', nil, false).returns(path)
       Puppet::FileSystem.stubs(:exist?).with(path).returns true
       Puppet.stubs(:features).returns(stub(:root? => true, :microsoft_windows? => false))
 
@@ -91,7 +91,7 @@ describe Puppet::Settings::AutosignSetting do
     end
 
     it "returns nil when the setting is a boolean" do
-      settings.stubs(:value).with('autosign').returns 'true'
+      settings.stubs(:value).with('autosign', nil, false).returns 'true'
 
       setting.mode = '0664'
       setting.owner = 'service'