puppet 3.4.3 → 3.5.0.rc1

data/spec/unit/type/zone_spec.rb

@@ -74,8 +74,8 @@ describe Puppet::Type.type(:zone) do
     relationship_graph.populate_from(catalog)
     relationship_graph.dependencies(zone).should == [zfs]
   end
-  describe StateMachine do
-    let (:sm) { StateMachine.new }
+  describe Puppet::Zone::StateMachine do
+    let (:sm) { Puppet::Zone::StateMachine.new }
     before :each do
       sm.insert_state :absent, :down => :destroy
       sm.insert_state :configured, :up => :configure, :down => :uninstall

data/spec/unit/type_spec.rb

@@ -347,6 +347,17 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
   end
 
+
+  describe "when defining a parent on a newtype" do
+    it "prints a deprecation message" do
+      Puppet.expects(:deprecation_warning)
+      type = Puppet::Type.newtype(:test_with_parent, :parent => Puppet::Type) do
+        newparam(:name) do end
+      end
+    end
+  end
+
+
   describe "when initializing" do
     describe "and passed a Puppet::Resource instance" do
       it "should set its title to the title of the resource if the resource type is equal to the current type" do

data/spec/unit/util/adsi_spec.rb

@@ -73,10 +73,12 @@ describe Puppet::Util::ADSI do
     let(:domain_username) { "#{domain}\\#{username}"}
 
     it "should generate the correct URI" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
       Puppet::Util::ADSI::User.uri(username).should == "WinNT://./#{username},user"
     end
 
     it "should generate the correct URI for a user with a domain" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
       Puppet::Util::ADSI::User.uri(username, domain).should == "WinNT://#{domain}/#{username},user"
     end
 
@@ -107,15 +109,35 @@ describe Puppet::Util::ADSI do
     end
 
     it "should be able to check the existence of a user" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
       Puppet::Util::ADSI.expects(:connect).with("WinNT://./#{username},user").returns connection
       Puppet::Util::ADSI::User.exists?(username).should be_true
     end
 
     it "should be able to check the existence of a domain user" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
       Puppet::Util::ADSI.expects(:connect).with("WinNT://#{domain}/#{username},user").returns connection
       Puppet::Util::ADSI::User.exists?(domain_username).should be_true
     end
 
+    it "should be able to confirm the existence of a user with a well-known SID",
+      :if => Puppet.features.microsoft_windows? do
+
+      system_user = Win32::Security::SID::LocalSystem
+      # ensure that the underlying OS is queried here
+      Puppet::Util::ADSI.unstub(:connect)
+      Puppet::Util::ADSI::User.exists?(system_user).should be_true
+    end
+
+    it "should return nil with an unknown SID",
+      :if => Puppet.features.microsoft_windows? do
+
+      bogus_sid = 'S-1-2-3-4'
+      # ensure that the underlying OS is queried here
+      Puppet::Util::ADSI.unstub(:connect)
+      Puppet::Util::ADSI::User.exists?(bogus_sid).should be_false
+    end
+
     it "should be able to delete a user" do
       connection.expects(:Delete).with('user', username)
 
@@ -123,6 +145,8 @@ describe Puppet::Util::ADSI do
     end
 
     it "should return an enumeration of IADsUser wrapped objects" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
+
       name = 'Administrator'
       wmi_users = [stub('WMI', :name => name)]
       Puppet::Util::ADSI.expects(:execquery).with('select name from win32_useraccount where localaccount = "TRUE"').returns(wmi_users)
@@ -174,7 +198,7 @@ describe Puppet::Util::ADSI do
         user.password = 'pwd'
       end
 
-      it "should generate the correct URI",:if => Puppet.features.microsoft_windows? do
+      it "should generate the correct URI", :if => Puppet.features.microsoft_windows? do
         Puppet::Util::Windows::Security.stubs(:octet_string_to_sid_object).returns(sid)
         user.uri.should == "WinNT://testcomputername/#{username},user"
       end
@@ -321,11 +345,13 @@ describe Puppet::Util::ADSI do
       end
 
       it "should generate the correct URI" do
+        Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
         group.uri.should == "WinNT://./#{groupname},group"
       end
     end
 
     it "should generate the correct URI" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
       Puppet::Util::ADSI::Group.uri("people").should == "WinNT://./people,group"
     end
 
@@ -342,11 +368,30 @@ describe Puppet::Util::ADSI do
     end
 
     it "should be able to confirm the existence of a group" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
       Puppet::Util::ADSI.expects(:connect).with("WinNT://./#{groupname},group").returns connection
 
       Puppet::Util::ADSI::Group.exists?(groupname).should be_true
     end
 
+    it "should be able to confirm the existence of a group with a well-known SID",
+      :if => Puppet.features.microsoft_windows? do
+
+      service_group = Win32::Security::SID::Service
+      # ensure that the underlying OS is queried here
+      Puppet::Util::ADSI.unstub(:connect)
+      Puppet::Util::ADSI::Group.exists?(service_group).should be_true
+    end
+
+    it "should return nil with an unknown SID",
+      :if => Puppet.features.microsoft_windows? do
+
+      bogus_sid = 'S-1-2-3-4'
+      # ensure that the underlying OS is queried here
+      Puppet::Util::ADSI.unstub(:connect)
+      Puppet::Util::ADSI::Group.exists?(bogus_sid).should be_false
+    end
+
     it "should be able to delete a group" do
       connection.expects(:Delete).with('group', groupname)
 
@@ -354,6 +399,8 @@ describe Puppet::Util::ADSI do
     end
 
     it "should return an enumeration of IADsGroup wrapped objects" do
+      Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
+
       name = 'Administrators'
       wmi_groups = [stub('WMI', :name => name)]
       Puppet::Util::ADSI.expects(:execquery).with('select name from win32_group where localaccount = "TRUE"').returns(wmi_groups)

data/spec/unit/util/autoload_spec.rb

@@ -24,40 +24,25 @@ describe Puppet::Util::Autoload do
     end
 
     it "should collect all of the lib directories that exist in the current environment's module path" do
-      Puppet[:environment] = "foo"
-      Puppet.settings.set_value(:modulepath, "#{@dira}#{File::PATH_SEPARATOR}#{@dirb}#{File::PATH_SEPARATOR}#{@dirc}", :foo)
-      Dir.expects(:entries).with(@dira).returns %w{one two}
-      Dir.expects(:entries).with(@dirb).returns %w{one two}
-
-      FileTest.stubs(:directory?).returns false
-      FileTest.expects(:directory?).with(@dira).returns true
-      FileTest.expects(:directory?).with(@dirb).returns true
-      ["#{@dira}/two/lib", "#{@dirb}/two/lib"].each do |d|
-        FileTest.expects(:directory?).with(d).returns true
-      end
-
-      @autoload.class.module_directories.should == ["#{@dira}/two/lib", "#{@dirb}/two/lib"]
-    end
+      environment = Puppet::Node::Environment.create(:foo, [@dira, @dirb, @dirc], '')
+      Dir.expects(:entries).with(@dira).returns %w{. .. one two}
+      Dir.expects(:entries).with(@dirb).returns %w{. .. one two}
 
-    it "should not look for lib directories in directories starting with '.'" do
-      Puppet[:environment] = "foo"
-      Puppet.settings.set_value(:modulepath, @dira, :foo)
-      Dir.expects(:entries).with(@dira).returns %w{. ..}
+      Puppet::FileSystem.expects(:directory?).with(@dira).returns true
+      Puppet::FileSystem.expects(:directory?).with(@dirb).returns true
+      Puppet::FileSystem.expects(:directory?).with(@dirc).returns false
 
-      FileTest.expects(:directory?).with(@dira).returns true
-      FileTest.expects(:directory?).with("#{@dira}/./lib").never
-      FileTest.expects(:directory?).with("#{@dira}/./plugins").never
-      FileTest.expects(:directory?).with("#{@dira}/../lib").never
-      FileTest.expects(:directory?).with("#{@dira}/../plugins").never
+      FileTest.expects(:directory?).with(regexp_matches(%r{two/lib})).times(2).returns true
+      FileTest.expects(:directory?).with(regexp_matches(%r{one/lib})).times(2).returns false
 
-      @autoload.class.module_directories
+      @autoload.class.module_directories(environment).should == ["#{@dira}/two/lib", "#{@dirb}/two/lib"]
     end
 
     it "should include the module directories, the Puppet libdir, and all of the Ruby load directories" do
       Puppet[:libdir] = %w{/libdir1 /lib/dir/two /third/lib/dir}.join(File::PATH_SEPARATOR)
       @autoload.class.expects(:gem_directories).returns %w{/one /two}
       @autoload.class.expects(:module_directories).returns %w{/three /four}
-      @autoload.class.search_directories.should == %w{/one /two /three /four} + Puppet[:libdir].split(File::PATH_SEPARATOR) + $LOAD_PATH
+      @autoload.class.search_directories(nil).should == %w{/one /two /three /four} + Puppet[:libdir].split(File::PATH_SEPARATOR) + $LOAD_PATH
     end
   end
 
@@ -71,7 +56,7 @@ describe Puppet::Util::Autoload do
 
     [RuntimeError, LoadError, SyntaxError].each do |error|
       it "should die with Puppet::Error if a #{error.to_s} exception is thrown" do
-        Puppet::FileSystem::File.stubs(:exist?).returns true
+        Puppet::FileSystem.stubs(:exist?).returns true
 
         Kernel.expects(:load).raises error
 
@@ -84,7 +69,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should register loaded files with the autoloader" do
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
 
@@ -94,7 +79,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should be seen by loaded? on the instance using the short name" do
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
 
@@ -104,7 +89,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should register loaded files with the main loaded file list so they are not reloaded by ruby" do
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       Kernel.stubs(:load)
 
       @autoload.load("myfile")
@@ -117,7 +102,7 @@ describe Puppet::Util::Autoload do
     it "should load the first file in the searchpath" do
       @autoload.stubs(:search_directories).returns [make_absolute("/a"), make_absolute("/b")]
       FileTest.stubs(:directory?).returns true
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       Kernel.expects(:load).with(make_absolute("/a/tmp/myfile.rb"), optionally(anything))
 
       @autoload.load("myfile")
@@ -126,7 +111,7 @@ describe Puppet::Util::Autoload do
     end
 
     it "should treat equivalent paths to a loaded file as loaded" do
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
 
@@ -144,7 +129,7 @@ describe Puppet::Util::Autoload do
       @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::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       @time_a = Time.utc(2010, 'jan', 1, 6, 30)
       File.stubs(:mtime).returns @time_a
 
@@ -185,7 +170,7 @@ describe Puppet::Util::Autoload do
 
     it "changes should be seen by changed? on the instance using the short name" do
       File.stubs(:mtime).returns(@first_time)
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       Kernel.stubs(:load)
       @autoload.load("myfile")
       @autoload.loaded?("myfile").should be
@@ -206,14 +191,14 @@ describe Puppet::Util::Autoload do
 
       it "should reload if mtime changes" do
         File.stubs(:mtime).with(@file_a).returns(@first_time + 60)
-        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns true
+        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns true
         Kernel.expects(:load).with(@file_a, optionally(anything))
         @autoload.class.reload_changed
       end
 
       it "should do nothing if the file is deleted" do
         File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
-        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns false
+        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns false
         Kernel.expects(:load).never
         @autoload.class.reload_changed
       end
@@ -228,8 +213,8 @@ describe Puppet::Util::Autoload do
         File.expects(:mtime).with(@file_a).returns(@first_time)
         @autoload.class.mark_loaded("file", @file_a)
         File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
-        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns false
-        Puppet::FileSystem::File.stubs(:exist?).with(@file_b).returns true
+        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
@@ -238,11 +223,11 @@ describe Puppet::Util::Autoload do
 
       it "should load a/file when b/file is loaded and a/file is created" do
         File.stubs(:mtime).with(@file_b).returns @first_time
-        Puppet::FileSystem::File.stubs(:exist?).with(@file_b).returns true
+        Puppet::FileSystem.stubs(:exist?).with(@file_b).returns true
         @autoload.class.mark_loaded("file", @file_b)
 
         File.stubs(:mtime).with(@file_a).returns @first_time
-        Puppet::FileSystem::File.stubs(:exist?).with(@file_a).returns true
+        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns true
         Kernel.expects(:load).with(@file_a, optionally(anything))
         @autoload.class.reload_changed
         @autoload.class.send(:loaded)["file"].should == [@file_a, @first_time]

data/spec/unit/util/backups_spec.rb

@@ -20,7 +20,7 @@ describe Puppet::Util::Backups do
       file = Puppet::Type.type(:file).new(:name => path)
 
       file.expects(:bucket).never
-      Puppet::FileSystem::File.expects(:exist?).with(path).returns false
+      Puppet::FileSystem.expects(:exist?).with(path).returns false
 
       file.perform_backup
     end
@@ -29,25 +29,23 @@ describe Puppet::Util::Backups do
       file = Puppet::Type.type(:file).new(:name => path, :backup => false)
 
       file.expects(:bucket).never
-      Puppet::FileSystem::File.expects(:exist?).never
+      Puppet::FileSystem.expects(:exist?).never
 
       file.perform_backup
     end
 
     it "a bucket should be used when provided" do
-      stub_file = stub(path, :lstat => mock('lstat', :ftype => 'file'))
-      Puppet::FileSystem::File.expects(:new).with(path).returns stub_file
+      lstat_path_as(path, 'file')
       bucket.expects(:backup).with(path).returns("mysum")
-      Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
+      Puppet::FileSystem.expects(:exist?).with(path).returns(true)
 
       file.perform_backup
     end
 
     it "should propagate any exceptions encountered when backing up to a filebucket" do
-      stub_file = stub(path, :lstat => mock('lstat', :ftype => 'file'))
-      Puppet::FileSystem::File.expects(:new).with(path).returns stub_file
+      lstat_path_as(path, 'file')
       bucket.expects(:backup).raises ArgumentError
-      Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
+      Puppet::FileSystem.expects(:exist?).with(path).returns(true)
 
       lambda { file.perform_backup }.should raise_error(ArgumentError)
     end
@@ -58,39 +56,35 @@ describe Puppet::Util::Backups do
       let(:file) { Puppet::Type.type(:file).new(:name => path, :backup => '.'+ext) }
 
       it "should remove any local backup if one exists" do
-        stub_file = stub(backup, :lstat => stub('stat', :ftype => 'file'))
-        Puppet::FileSystem::File.expects(:new).with(backup).returns stub_file
-        Puppet::FileSystem::File.expects(:unlink).with(backup)
+        lstat_path_as(backup, 'file')
+        Puppet::FileSystem.expects(:unlink).with(backup)
         FileUtils.stubs(:cp_r)
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
+        Puppet::FileSystem.expects(:exist?).with(path).returns(true)
 
         file.perform_backup
       end
 
       it "should fail when the old backup can't be removed" do
-        stub_file = stub(backup, :lstat => stub('stat', :ftype => 'file'))
-        Puppet::FileSystem::File.expects(:new).with(backup).returns stub_file
-        Puppet::FileSystem::File.expects(:unlink).with(backup).raises ArgumentError
+        lstat_path_as(backup, 'file')
+        Puppet::FileSystem.expects(:unlink).with(backup).raises ArgumentError
         FileUtils.expects(:cp_r).never
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
+        Puppet::FileSystem.expects(:exist?).with(path).returns(true)
 
         lambda { file.perform_backup }.should raise_error(Puppet::Error)
       end
 
       it "should not try to remove backups that don't exist" do
-        stub_file = stub(backup)
-        Puppet::FileSystem::File.expects(:new).with(backup).returns stub_file
-        stub_file.expects(:lstat).raises(Errno::ENOENT)
-        Puppet::FileSystem::File.expects(:unlink).with(backup).never
+        Puppet::FileSystem.expects(:lstat).with(backup).raises(Errno::ENOENT)
+        Puppet::FileSystem.expects(:unlink).with(backup).never
         FileUtils.stubs(:cp_r)
-        Puppet::FileSystem::File.expects(:exist?).with(path).returns(true)
+        Puppet::FileSystem.expects(:exist?).with(path).returns(true)
 
         file.perform_backup
       end
 
       it "a copy should be created in the local directory" do
         FileUtils.expects(:cp_r).with(path, backup, :preserve => true)
-        Puppet::FileSystem::File.stubs(:exist?).with(path).returns(true)
+        Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
 
         file.perform_backup.should be_true
       end
@@ -98,7 +92,7 @@ describe Puppet::Util::Backups do
       it "should propagate exceptions if no backup can be created" do
         FileUtils.expects(:cp_r).raises ArgumentError
 
-        Puppet::FileSystem::File.stubs(:exist?).with(path).returns(true)
+        Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
         lambda { file.perform_backup }.should raise_error(Puppet::Error)
       end
     end
@@ -114,11 +108,10 @@ describe Puppet::Util::Backups do
 
       bucket.expects(:backup).with(filename).returns true
 
-      stub_file = stub(path, :lstat => stub('stat', :ftype => 'directory'))
-      Puppet::FileSystem::File.expects(:new).with(path).returns stub_file
+      lstat_path_as(path, 'directory')
 
-      Puppet::FileSystem::File.stubs(:exist?).with(path).returns(true)
-      Puppet::FileSystem::File.stubs(:exist?).with(filename).returns(true)
+      Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
+      Puppet::FileSystem.stubs(:exist?).with(filename).returns(true)
 
       file.perform_backup
     end
@@ -128,10 +121,14 @@ describe Puppet::Util::Backups do
 
       bucket.expects(:backup).never
       stub_file = stub('file', :stat => stub('stat', :ftype => 'directory'))
-      Puppet::FileSystem::File.stubs(:new).with(path).returns stub_file
+      Puppet::FileSystem.stubs(:new).with(path).returns stub_file
       Find.expects(:find).never
 
       file.perform_backup
     end
   end
+
+  def lstat_path_as(path, ftype)
+    Puppet::FileSystem.expects(:lstat).with(path).returns(stub('File::Stat', :ftype => ftype))
+  end
 end

data/spec/unit/util/checksums_spec.rb

@@ -131,9 +131,7 @@ describe Puppet::Util::Checksums do
       it "should use the '#{sum}' on the file to determine the ctime" do
         file = "/my/file"
         stat = mock 'stat', sum => "mysum"
-
-        stub_file = stub(file, :stat => stat)
-        Puppet::FileSystem::File.expects(:new).with(file).returns stub_file
+        Puppet::FileSystem.expects(:stat).with(file).returns(stat)
 
         @summer.send(sum.to_s + "_file", file).should == "mysum"
       end

data/spec/unit/util/colors_spec.rb

@@ -66,4 +66,18 @@ describe Puppet::Util::Colors do
       end
     end
   end
+
+  describe "on Windows", :if => Puppet.features.microsoft_windows? do
+    it "expects a trailing embedded NULL character in the wide string" do
+      message = "hello"
+
+      console = Puppet::Util::Colors::WideConsole.new
+      wstr, nchars = console.string_encode(message)
+
+      expect(nchars).to eq(message.length)
+
+      expect(wstr.length).to eq(nchars + 1)
+      expect(wstr[-1].ord).to be_zero
+    end
+  end
 end