puppet 5.3.7-x64-mingw32 → 5.4.0-x64-mingw32

data/spec/integration/util/windows/adsi_spec.rb

@@ -81,91 +81,6 @@ describe Puppet::Util::Windows::ADSI::Group,
   end
 
   describe '.members' do
-    it 'should return a list of members resolvable with Puppet::Util::Windows::ADSI::Group.name_sid_hash' do
-      temp_groupname = "g#{SecureRandom.uuid}"
-      temp_username  = "u#{SecureRandom.uuid}"[0..12]
-
-      # select a virtual account that requires an authority to be able to resolve to SID
-      # the Dhcp service is chosen for no particular reason aside from it's a service available on all Windows versions
-      dhcp_virtualaccount = Puppet::Util::Windows::SID.name_to_principal('NT SERVICE\Dhcp')
-
-      # adding :SidTypeGroup as a group member will cause error in IAdsUser::Add
-      # adding :SidTypeDomain (such as S-1-5-80 / NT SERVICE or computer name) won't error
-      #   but also won't be returned as a group member
-      # uncertain how to obtain :SidTypeComputer (perhaps AD? the local machine is :SidTypeDomain)
-      users = [
-        # Use sid_to_name to get localized names of SIDs - BUILTIN, SYSTEM, NT AUTHORITY, Everyone are all localized
-        # :SidTypeWellKnownGroup
-        # SYSTEM is prefixed with the NT Authority authority, resolveable with or without authority
-        { :sid => 'S-1-5-18', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-5-18') },
-        # Everyone is not prefixed with an authority, resolveable with or without NT AUTHORITY authority
-        { :sid => 'S-1-1-0', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-1-0') },
-        # Dhcp service account is prefixed with NT SERVICE authority, requires authority to resolve SID
-        # behavior is similar to IIS APPPOOL\DefaultAppPool
-        { :sid => dhcp_virtualaccount.sid, :name => dhcp_virtualaccount.domain_account },
-
-        # :SidTypeAlias with authority component
-        # Administrators group is prefixed with BUILTIN authority, can be resolved with or without authority
-        { :sid => 'S-1-5-32-544', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-5-32-544') },
-      ]
-
-      begin
-        # :SidTypeUser as user on localhost, can be resolved with or without authority prefix
-        user = Puppet::Util::Windows::ADSI::User.create(temp_username)
-        user.commit()
-        users.push({ :sid => user.sid.sid, :name => Puppet::Util::Windows::ADSI.computer_name + '\\' + temp_username })
-
-        # create a test group and add above 5 members by SID
-        group = described_class.create(temp_groupname)
-        group.commit()
-        group.set_members(users.map { |u| u[:sid]} )
-
-        # most importantly make sure that all name are convertible to SIDs
-        expect { described_class.name_sid_hash(group.members) }.to_not raise_error
-
-        # also verify the names returned are as expected
-        expected_usernames = users.map { |u| u[:name] }
-        expect(group.members.map(&:domain_account)).to eq(expected_usernames)
-      ensure
-        described_class.delete(temp_groupname) if described_class.exists?(temp_groupname)
-        Puppet::Util::Windows::ADSI::User.delete(temp_username) if Puppet::Util::Windows::ADSI::User.exists?(temp_username)
-      end
-    end
-
-    it 'should return a list of Principal objects even with unresolvable SIDs' do
-      members = [
-        # NULL SID is not localized
-        stub('WIN32OLE', {
-          :objectSID => [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          :Name => 'NULL SID',
-          :ole_respond_to? => true,
-        }),
-        # unresolvable SID is a different story altogether
-        stub('WIN32OLE', {
-          # completely valid SID, but Name is just a stringified version
-          :objectSID => [1, 5, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 5, 113, 65, 218, 15, 127, 9, 57, 219, 4, 84, 126, 88, 4, 0, 0],
-          :Name => 'S-1-5-21-3661721861-956923663-2119435483-1112',
-          :ole_respond_to? => true,
-        })
-      ]
-
-      admins_name = Puppet::Util::Windows::SID.sid_to_name('S-1-5-32-544')
-      admins = Puppet::Util::Windows::ADSI::Group.new(admins_name)
-
-      # touch the native_group member to have it lazily loaded, so COM objects can be stubbed
-      admins.native_group
-      admins.native_group.stubs(:Members).returns(members)
-
-      # well-known NULL SID
-      expect(admins.members[0].sid).to eq('S-1-0-0')
-      expect(admins.members[0].account_type).to eq(:SidTypeWellKnownGroup)
-
-      # unresolvable SID
-      expect(admins.members[1].sid).to eq('S-1-5-21-3661721861-956923663-2119435483-1112')
-      expect(admins.members[1].account).to eq('S-1-5-21-3661721861-956923663-2119435483-1112 (unresolvable)')
-      expect(admins.members[1].account_type).to eq(:SidTypeUnknown)
-    end
-
     it 'should return a list of members with UTF-8 names' do
       begin
         original_codepage = Encoding.default_external
@@ -173,7 +88,7 @@ describe Puppet::Util::Windows::ADSI::Group,
 
         # lookup by English name Administrators is not OK on localized Windows
         admins = Puppet::Util::Windows::ADSI::Group.new(administrators_principal.account)
-        admins.members.map(&:domain_account).each do |name|
+        admins.members.each do |name|
           expect(name.encoding).to be(Encoding::UTF_8)
         end
       ensure

data/spec/integration/util/windows/principal_spec.rb

@@ -8,7 +8,7 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
   let (:system_bytes) { [1, 1, 0, 0, 0, 0, 0, 5, 18, 0, 0, 0] }
   let (:null_sid_bytes) { bytes = [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }
   let (:administrator_bytes) { [1, 2, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 32, 2, 0, 0] }
-  let (:computer_sid) { Puppet::Util::Windows::SID.name_to_principal(Puppet::Util::Windows::ADSI.computer_name) }
+  let (:computer_sid) { Puppet::Util::Windows::SID.name_to_sid_object(Puppet::Util::Windows::ADSI.computer_name) }
   # BUILTIN is localized on German Windows, but not French
   # looking this up like this dilutes the values of the tests as we're comparing two mechanisms
   # for returning the same values, rather than to a known good
@@ -23,7 +23,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq('')
       expect(principal.domain_account).to eq('NULL SID')
       expect(principal.account_type).to eq(:SidTypeWellKnownGroup)
-      expect(principal.to_s).to eq('NULL SID')
     end
 
     it "should create an instance from a well-known account prefixed with NT AUTHORITY" do
@@ -40,7 +39,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
         expect(principal.account).to eq('SYSTEM')
         expect(principal.domain).to eq('NT AUTHORITY')
         expect(principal.domain_account).to eq('NT AUTHORITY\\SYSTEM')
-        expect(principal.to_s).to eq('NT AUTHORITY\\SYSTEM')
       end
 
       # Windows API LookupAccountSid behaves differently if current user is SYSTEM
@@ -89,7 +87,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq(domain)
       expect(principal.domain_account).to eq(qualified_name)
       expect(principal.account_type).to eq(:SidTypeAlias)
-      expect(principal.to_s).to eq(qualified_name)
     end
 
     it "should raise an error when trying to lookup an account that doesn't exist" do
@@ -109,7 +106,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.account).to eq(builtin_localized)
       expect(principal.domain).to eq(builtin_localized)
       expect(principal.domain_account).to eq(builtin_localized)
-      expect(principal.to_s).to eq(builtin_localized)
     end
 
     it "should return a BUILTIN domain principal for BUILTIN account names" do
@@ -119,7 +115,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.account).to eq(builtin_localized)
       expect(principal.domain).to eq(builtin_localized)
       expect(principal.domain_account).to eq(builtin_localized)
-      expect(principal.to_s).to eq(builtin_localized)
     end
 
   end
@@ -140,7 +135,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq(computer_sid.domain)
       expect(principal.domain_account).to eq(guest_name)
       expect(principal.account_type).to eq(:SidTypeUser)
-      expect(principal.to_s).to eq(guest_name)
     end
 
     it "should create an instance from a well-known group SID" do
@@ -151,7 +145,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq('')
       expect(principal.domain_account).to eq('NULL SID')
       expect(principal.account_type).to eq(:SidTypeWellKnownGroup)
-      expect(principal.to_s).to eq('NULL SID')
     end
 
     it "should create an instance from a well-known BUILTIN Alias SID" do
@@ -167,7 +160,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq(domain)
       expect(principal.domain_account).to eq(qualified_name)
       expect(principal.account_type).to eq(:SidTypeAlias)
-      expect(principal.to_s).to eq(qualified_name)
     end
 
     it "should raise an error when trying to lookup nil" do
@@ -222,7 +214,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.account).to eq(builtin_localized)
       expect(principal.domain).to eq(builtin_localized)
       expect(principal.domain_account).to eq(builtin_localized)
-      expect(principal.to_s).to eq(builtin_localized)
     end
   end
 

data/spec/shared_contexts/checksum.rb

@@ -11,7 +11,10 @@ CHECKSUM_TYPES_TO_TRY = [
   ['md5', 'a7a169ac84bb863b30484d0aa03139c1'],
   ['md5lite', '22b4182363e81b326e98231fde616782'],
   ['sha256', '47fcae62967db2fb5cba2fc0d9cf3e6767035d763d825ecda535a7b1928b9746'],
-  ['sha256lite', 'fd50217a2b0286ba25121bf2297bbe6c197933992de67e4e568f19861444ecf8']
+  ['sha256lite', 'fd50217a2b0286ba25121bf2297bbe6c197933992de67e4e568f19861444ecf8'],
+  ['sha224', '6894cd976b60b2caa825bc699b54f715853659f0243f67cda4dd7ac4'],
+  ['sha384', 'afc3d952fe1a4d3aa083d438ea464f6e7456c048d34ff554340721b463b38547e5ee7c964513dfba0d65dd91ac97deb5'],
+  ['sha512', 'a953dcd95824cfa2a555651585d3980b1091a740a785d52ee5e72a55c9038242433e55026758636b0a29d0e5f9e77f24bc888ea5d5e01ab36d2bbcb3d3163859']
 ]
 
 CHECKSUM_STAT_TIME = Time.now

data/spec/shared_contexts/digests.rb

@@ -11,7 +11,7 @@
 # automatically based on the rspec metadata selected with
 # `with_digest_algorithms`.
 
-DIGEST_ALGORITHMS_TO_TRY = ['md5', 'sha256']
+DIGEST_ALGORITHMS_TO_TRY = ['md5', 'sha256', 'sha384', 'sha512', 'sha224']
 
 shared_context('with supported digest algorithms', :uses_checksums => true) do
 
@@ -53,3 +53,48 @@ shared_context("when digest_algorithm is set to md5", :digest_algorithm => 'md5'
     Puppet::Util::Checksums.md5(content)
   end
 end
+
+shared_context("when digest_algorithm is set to sha512", :digest_algorithm => 'sha512') do
+  before { Puppet[:digest_algorithm] = 'sha512' }
+  after { Puppet[:digest_algorithm] = nil }
+
+  let(:digest_algorithm) { 'sha512' }
+
+  let(:plaintext) { "my\r\ncontents" }
+  let(:checksum) { 'ed9b62ae313c8e4e3e6a96f937101e85f8f8af8d51dea7772177244087e5d6152778605ad6bdb42886ff1436abaec4fa44acbfe171fda755959b52b0e4e015d4' }
+  let(:bucket_dir) { 'e/d/9/b/6/2/a/e/ed9b62ae313c8e4e3e6a96f937101e85f8f8af8d51dea7772177244087e5d6152778605ad6bdb42886ff1436abaec4fa44acbfe171fda755959b52b0e4e015d4' }
+
+  def digest(content)
+    Puppet::Util::Checksums.sha512(content)
+  end
+end
+
+shared_context("when digest_algorithm is set to sha384", :digest_algorithm => 'sha384') do
+  before { Puppet[:digest_algorithm] = 'sha384' }
+  after { Puppet[:digest_algorithm] = nil }
+
+  let(:digest_algorithm) { 'sha384' }
+
+  let(:plaintext) { "my\r\ncontents" }
+  let(:checksum) { 'f40debfec135e4f2b9fb92110c53aadb8e9bda28bb05f09901480fd70126fe3b70f9f074ce6182ec8184eb1bcabe4440' }
+  let(:bucket_dir) { 'f/4/0/d/e/b/f/e/f40debfec135e4f2b9fb92110c53aadb8e9bda28bb05f09901480fd70126fe3b70f9f074ce6182ec8184eb1bcabe4440' }
+
+  def digest(content)
+    Puppet::Util::Checksums.sha384(content)
+  end
+end
+
+shared_context("when digest_algorithm is set to sha224", :digest_algorithm => 'sha224') do
+  before { Puppet[:digest_algorithm] = 'sha224' }
+  after { Puppet[:digest_algorithm] = nil }
+
+  let(:digest_algorithm) { 'sha224' }
+
+  let(:plaintext) { "my\r\ncontents" }
+  let(:checksum) { 'b8c05079b24c37a0e03f03e611167a3ea24455db3ad638a3a0c7e9cb' }
+  let(:bucket_dir) { 'b/8/c/0/5/0/7/9/b8c05079b24c37a0e03f03e611167a3ea24455db3ad638a3a0c7e9cb' }
+
+  def digest(content)
+    Puppet::Util::Checksums.sha224(content)
+  end
+end

data/spec/shared_contexts/types_setup.rb

@@ -1,6 +1,7 @@
 shared_context 'types_setup' do
 
   # Do not include the special type Unit in this list
+  # Do not include the type Variant in this list as it needs to be parameterized to be meaningful
   def self.all_types
     [ Puppet::Pops::Types::PAnyType,
       Puppet::Pops::Types::PUndefType,
@@ -23,7 +24,6 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PResourceType,
       Puppet::Pops::Types::PPatternType,
       Puppet::Pops::Types::PEnumType,
-      Puppet::Pops::Types::PVariantType,
       Puppet::Pops::Types::PStructType,
       Puppet::Pops::Types::PTupleType,
       Puppet::Pops::Types::PCallableType,
@@ -38,13 +38,17 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PTimestampType,
       Puppet::Pops::Types::PSensitiveType,
       Puppet::Pops::Types::PBinaryType,
-      Puppet::Pops::Types::PInitType
+      Puppet::Pops::Types::PInitType,
+      Puppet::Pops::Types::PURIType,
     ]
   end
   def all_types
     self.class.all_types
   end
 
+  # Do not include the Variant type in this list - while it is abstract it is also special in that
+  # it must be parameterized to be meaningful.
+  #
   def self.abstract_types
     [ Puppet::Pops::Types::PAnyType,
       Puppet::Pops::Types::PCallableType,
@@ -62,7 +66,6 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PPatternType,
       Puppet::Pops::Types::PScalarType,
       Puppet::Pops::Types::PScalarDataType,
-      Puppet::Pops::Types::PVariantType,
       Puppet::Pops::Types::PUndefType,
       Puppet::Pops::Types::PTypeReferenceType,
       Puppet::Pops::Types::PTypeAliasType,
@@ -181,7 +184,9 @@ shared_context 'types_setup' do
     result << Puppet::Pops::Types::PHashType.new(tf.rich_data_key, tf.rich_data)
     result << Puppet::Pops::Types::PUndefType
     result << Puppet::Pops::Types::PDefaultType
+    result << Puppet::Pops::Types::PURIType
     result << Puppet::Pops::Types::PTupleType.new([tf.rich_data])
+    result << Puppet::Pops::Types::PObjectType
     result
   end
   def rich_data_compatible_types

data/spec/unit/agent_spec.rb

@@ -66,7 +66,7 @@ describe Puppet::Agent do
   it "should initialize the client's transaction_uuid if passed as a client_option" do
     client = mock 'client'
     transaction_uuid = 'foo'
-    AgentTestClient.expects(:new).with(anything, transaction_uuid, nil).returns client
+    AgentTestClient.expects(:new).with(transaction_uuid, nil).returns client
 
     client.expects(:run)
 
@@ -77,7 +77,7 @@ describe Puppet::Agent do
   it "should initialize the client's job_id if passed as a client_option" do
     client = mock 'client'
     job_id = '289'
-    AgentTestClient.expects(:new).with(anything, anything, job_id).returns client
+    AgentTestClient.expects(:new).with(anything, job_id).returns client
 
     client.expects(:run)
 

data/spec/unit/application/cert_spec.rb

@@ -191,9 +191,9 @@ describe Puppet::Application::Cert => true do
       @cert_app.subcommand = :destroy
       @cert_app.command_line.stubs(:args).returns(["unsigned-node"])
 
-      Puppet::SSL::CertificateAuthority::Interface.unstub(:new)
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).with(:revoke, anything).never
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).with(:destroy, {:to => ['unsigned-node'], :digest => nil}).returns(@iface)
+      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to| cert_mode == :destroy
+        to[:to] == ["unsigned-node"]
+      }
 
       @cert_app.main
     end
@@ -203,28 +203,16 @@ describe Puppet::Application::Cert => true do
       @cert_app.command_line.stubs(:args).returns(["host","unsigned-node"])
 
       Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to|
-        cert_mode == :revoke &&
+        cert_mode == :revoke
         to[:to] == ["host"]
       }
       Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to|
-        cert_mode == :destroy &&
+        cert_mode == :destroy
         to[:to] == ["host","unsigned-node"]
       }
 
       @cert_app.main
     end
-
-    it "should refuse to destroy all certificates" do
-      @cert_app.subcommand = :destroy
-      @cert_app.all = true
-
-      Puppet::SSL::CertificateAuthority::Interface.unstub(:new)
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).never
-
-      Puppet.expects(:log_exception).with {|e| e.message == "Refusing to destroy all certs, provide an explicit list of certs to destroy"}
-
-      expect { @cert_app.main }.to exit_with(24)
-    end
   end
 
   describe "when identifying subcommands" do

data/spec/unit/application/device_spec.rb

@@ -5,7 +5,6 @@ require 'puppet/application/device'
 require 'puppet/util/network_device/config'
 require 'ostruct'
 require 'puppet/configurer'
-require 'puppet/application/apply'
 
 describe Puppet::Application::Device do
   include PuppetSpec::Files
@@ -128,18 +127,6 @@ describe Puppet::Application::Device do
       expect(@device.args[:Port]).to eq("42")
     end
 
-    it "should store the target options with --target" do
-      @device.options.expects(:[]=).with(:target,'test123')
-
-      @device.handle_target('test123')
-    end
-
-    it "should store the resource options with --resource" do
-      @device.options.expects(:[]=).with(:resource,true)
-
-      @device.handle_resource(true)
-    end
-
   end
 
   describe "during setup" do
@@ -290,11 +277,7 @@ describe Puppet::Application::Device do
       Puppet.stubs(:notice)
       @device.options.stubs(:[]).with(:detailed_exitcodes).returns(false)
       @device.options.stubs(:[]).with(:target).returns(nil)
-      @device.options.stubs(:[]).with(:apply).returns(nil)
-      @device.options.stubs(:[]).with(:resource).returns(false)
-      @device.options.stubs(:[]).with(:to_yaml).returns(false)
       @device.options.stubs(:[]).with(:client)
-      @device.command_line.stubs(:args).returns([])
       Puppet::Util::NetworkDevice::Config.stubs(:devices).returns({})
     end
 
@@ -303,12 +286,6 @@ describe Puppet::Application::Device do
       @device.run_command
     end
 
-    it "should exit if resource is requested without target" do
-      @device.options.stubs(:[]).with(:resource).returns(true)
-      Puppet.expects(:err).with "resource command requires target"
-      expect { @device.main }.to exit_with 1
-    end
-
     it "should get the device list" do
       device_hash = stub_everything 'device hash'
       Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
@@ -324,8 +301,8 @@ describe Puppet::Application::Device do
       }
 
       Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
-      URI.expects(:parse).with("ssh://user:pass@testhost")
-      URI.expects(:parse).with("https://user:pass@testhost/some/path").never
+      Puppet.expects(:info).with("starting applying configuration to device1 at ssh://testhost")
+      Puppet.expects(:info).with("starting applying configuration to device2 at https://testhost:443/some/path").never
       expect { @device.main }.to exit_with 1
     end
 
@@ -341,32 +318,6 @@ describe Puppet::Application::Device do
       expect { @device.main }.to exit_with 1
     end
 
-    it "should error if target is passed and the apply path is incorrect" do
-      @device.options.stubs(:[]).with(:apply).returns('file.pp')
-      @device.options.stubs(:[]).with(:target).returns('device1')
-
-      File.expects(:file?).returns(false)
-      Puppet.expects(:err).with(regexp_matches(/does not exist, cannot apply/))
-      expect { @device.main }.to exit_with 1
-    end
-
-    it "should run an apply" do
-      @device.options.stubs(:[]).with(:apply).returns('file.pp')
-      @device.options.stubs(:[]).with(:target).returns('device1')
-      device_hash = {
-        "device1" => OpenStruct.new(:name => "device1", :url => "ssh://user:pass@testhost", :provider => "cisco"),
-      }
-      Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
-      Puppet::Util::NetworkDevice.stubs(:init)
-      File.expects(:file?).returns(true)
-
-      Puppet::Util::CommandLine.expects(:new).once
-      Puppet::Application::Apply.expects(:new).once
-
-      Puppet::Configurer.expects(:new).never
-      expect { @device.main }.to exit_with 1
-    end
-
     it "should exit if the device list is empty" do
       expect { @device.main }.to exit_with 1
     end
@@ -405,51 +356,6 @@ describe Puppet::Application::Device do
         expect { @device.main }.to exit_with 1
       end
 
-      it "should raise an error if no type is given" do
-        @device.options.stubs(:[]).with(:resource).returns(true)
-        @device.options.stubs(:[]).with(:target).returns('device1')
-        @device.command_line.stubs(:args).returns([])
-        Puppet.expects(:log_exception).with {|e| e.message == "You must specify the type to display"}
-        expect { @device.main }.to exit_with 1
-      end
-
-      it "should raise an error if the type is not found" do
-        @device.options.stubs(:[]).with(:resource).returns(true)
-        @device.options.stubs(:[]).with(:target).returns('device1')
-        @device.command_line.stubs(:args).returns(['nope'])
-        Puppet.expects(:log_exception).with {|e| e.message == "Could not find type nope"}
-        expect { @device.main }.to exit_with 1
-      end
-
-      it "should retrieve all resources of a type" do
-        @device.options.stubs(:[]).with(:resource).returns(true)
-        @device.options.stubs(:[]).with(:target).returns('device1')
-        @device.command_line.stubs(:args).returns(['user'])
-        Puppet::Resource.indirection.expects(:search).with('user/', {}).returns([])
-        expect { @device.main }.to exit_with 1
-      end
-
-      it "should retrieve named resources of a type" do
-        @device.options.stubs(:[]).with(:resource).returns(true)
-        @device.options.stubs(:[]).with(:target).returns('device1')
-        @device.command_line.stubs(:args).returns(['user', 'title'])
-        Puppet::Resource.indirection.expects(:find).with('user/title')
-        expect { @device.main }.to exit_with 1
-      end
-
-      it "should output resources as YAML" do
-        resources = [
-          Puppet::Type.type(:user).new(:name => "title").to_resource,
-        ]
-        @device.options.stubs(:[]).with(:resource).returns(true)
-        @device.options.stubs(:[]).with(:target).returns('device1')
-        @device.options.stubs(:[]).with(:to_yaml).returns(true)
-        @device.command_line.stubs(:args).returns(['user'])
-        Puppet::Resource.indirection.expects(:search).with('user/', {}).returns(resources)
-        @device.expects(:puts).with("user:\n  title:\n")
-        expect { @device.main }.to exit_with 1
-      end
-
       it "should make sure all the required folders and files are created" do
         Puppet.settings.expects(:use).with(:main, :agent, :ssl).twice
         expect { @device.main }.to exit_with 1