puppet 6.29.0-x64-mingw32 → 7.0.0-x64-mingw32

data/spec/unit/application/lookup_spec.rb

@@ -518,155 +518,34 @@ Searching for "a"
       end
 
       it 'receives extra facts in top scope' do
-        file_path = file_containing('facts.yaml', <<~CONTENT)
+        file_path = tmpdir('lookup_spec')
+        filename = File.join(file_path, "facts.yaml")
+        File.open(filename, "w+") { |f| f.write(<<-YAML.unindent) }
           ---
           cx: ' C from facts'
-        CONTENT
+          YAML
 
         lookup.options[:node] = node
-        lookup.options[:fact_file] = file_path
+        lookup.options[:fact_file] = filename
         lookup.options[:render_as] = :s
         allow(lookup.command_line).to receive(:args).and_return(['c'])
         expect(run_lookup(lookup)).to eql("This is C from facts")
       end
 
       it 'receives extra facts in the facts hash' do
-        file_path = file_containing('facts.yaml', <<~CONTENT)
+        file_path = tmpdir('lookup_spec')
+        filename = File.join(file_path, "facts.yaml")
+        File.open(filename, "w+") { |f| f.write(<<-YAML.unindent) }
           ---
           cx: ' G from facts'
-        CONTENT
+        YAML
 
         lookup.options[:node] = node
-        lookup.options[:fact_file] = file_path
+        lookup.options[:fact_file] = filename
         lookup.options[:render_as] = :s
         allow(lookup.command_line).to receive(:args).and_return(['g'])
         expect(run_lookup(lookup)).to eql("This is G from facts in facts hash")
       end
-
-      describe 'when retrieving given facts' do
-        before do
-          lookup.options[:node] = node
-          allow(lookup.command_line).to receive(:args).and_return(['g'])
-        end
-
-        it 'loads files with yaml extension as yaml on first try' do
-          file_path = file_containing('facts.yaml', <<~CONTENT)
-            ---
-            cx: ' G from facts'
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect(Puppet::Util::Yaml).to receive(:safe_load_file).with(file_path, []).and_call_original
-          run_lookup(lookup)
-        end
-
-        it 'loads files with yml extension as yaml on first try' do
-          file_path = file_containing('facts.yml', <<~CONTENT)
-            ---
-            cx: ' G from facts'
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect(Puppet::Util::Yaml).to receive(:safe_load_file).with(file_path, []).and_call_original
-          run_lookup(lookup)
-        end
-
-        it 'loads files with json extension as json on first try' do
-          file_path = file_containing('facts.json', <<~CONTENT)
-            {
-              "cx": " G from facts"
-            }
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect(Puppet::Util::Json).to receive(:load_file).with(file_path, {}).and_call_original
-          run_lookup(lookup)
-        end
-
-        it 'detects file format accordingly even with random file extension' do
-          file_path = file_containing('facts.txt', <<~CONTENT)
-            {
-              "cx": " G from facts"
-            }
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect(Puppet::Util::Json).to receive(:load_file_if_valid).with(file_path).and_call_original
-          expect(Puppet::Util::Yaml).not_to receive(:safe_load_file_if_valid).with(file_path)
-          run_lookup(lookup)
-        end
-
-        it 'detects file without extension as json due to valid contents' do
-          file_path = file_containing('facts', <<~CONTENT)
-            {
-              "cx": " G from facts"
-            }
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect(Puppet::Util::Json).to receive(:load_file_if_valid).with(file_path).and_call_original
-          expect(Puppet::Util::Yaml).not_to receive(:safe_load_file_if_valid).with(file_path)
-          run_lookup(lookup)
-        end
-
-        it 'detects file without extension as yaml due to valid contents' do
-          file_path = file_containing('facts', <<~CONTENT)
-            ---
-            cx: ' G from facts'
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect(Puppet::Util::Json.load_file_if_valid(file_path)).to be_nil
-          expect(Puppet::Util::Yaml).to receive(:safe_load_file_if_valid).with(file_path).and_call_original
-          run_lookup(lookup)
-        end
-
-        it 'raises error due to invalid contents' do
-          file_path = file_containing('facts.yml', <<~CONTENT)
-            INVALID CONTENT
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect {
-            lookup.run_command
-          }.to raise_error(/Incorrectly formatted data in .+ given via the --facts flag \(only accepts yaml and json files\)/)
-        end
-
-        it "fails when a node doesn't have facts" do
-          lookup.options[:node] = "bad.node"
-          allow(lookup.command_line).to receive(:args).and_return(['c'])
-
-          expected_error = "No facts available for target node: #{lookup.options[:node]}"
-          expect { lookup.run_command }.to raise_error(RuntimeError, expected_error)
-        end
-
-        it 'raises error due to missing trusted information facts in --facts file' do
-          file_path = file_containing('facts.yaml', <<~CONTENT)
-            ---
-            fqdn: some.fqdn.com
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect {
-            lookup.run_command
-          }.to raise_error(/When overriding any of the hostname,domain,fqdn,clientcert facts with #{file_path} given via the --facts flag, they must all be overridden./)
-        end
-
-        it 'does not fail when all trusted information facts are provided via --facts file' do
-          file_path = file_containing('facts.yaml', <<~CONTENT)
-            ---
-            fqdn: some.fqdn.com
-            hostname: some.hostname
-            domain: some.domain
-            clientcert: some.clientcert
-          CONTENT
-          lookup.options[:fact_file] = file_path
-
-          expect {
-            lookup.run_command
-          }.to exit_with(0)
-        end
-      end
     end
 
     context 'using a puppet function as data provider' do

data/spec/unit/application/resource_spec.rb

@@ -129,35 +129,6 @@ describe Puppet::Application::Resource do
   end
 
   describe "when printing output" do
-    it "should not emit puppet class tags when printing yaml" do
-      Puppet::Type.newtype(:stringify) do
-        ensurable
-        newparam(:name, isnamevar: true)
-        newproperty(:string)
-      end
-
-      Puppet::Type.type(:stringify).provide(:stringify) do
-        def exists?
-          true
-        end
-
-        def string
-          Puppet::Util::Execution::ProcessOutput.new('test', 0)
-        end
-      end
-
-      @resource_app.options[:to_yaml] = true
-      allow(@resource_app.command_line).to receive(:args).and_return(['stringify', 'hello', 'ensure=present', 'string=asd'])
-      expect(@resource_app).to receive(:puts).with(<<~YAML)
-      ---
-      stringify:
-        hello:
-          ensure: present
-          string: test
-      YAML
-      expect { @resource_app.main }.not_to raise_error
-    end
-
     it "should ensure all values to be printed are in the external encoding" do
       resources = [
         Puppet::Type.type(:user).new(:name => "\u2603".force_encoding(Encoding::UTF_8)).to_resource,

data/spec/unit/application/ssl_spec.rb

@@ -92,7 +92,7 @@ describe Puppet::Application::Ssl, unless: Puppet::Util::Platform.jruby? do
   end
 
   context 'when submitting a CSR' do
-    let(:csr_path) { File.join(Puppet[:requestdir], "#{name}.pem") }
+    let(:csr_path) { Puppet[:hostcsr] }
 
     before do
       ssl.command_line.args << 'submit_request'
@@ -318,7 +318,7 @@ describe Puppet::Application::Ssl, unless: Puppet::Util::Platform.jruby? do
     end
 
     it 'deletes the request' do
-      path = File.join(Puppet[:requestdir], "#{Puppet[:certname]}.pem")
+      path = Puppet[:hostcsr]
       File.write(path, @host[:csr].to_pem)
 
       expects_command_to_pass(%r{Removed certificate request #{path}})
@@ -432,27 +432,4 @@ describe Puppet::Application::Ssl, unless: Puppet::Util::Platform.jruby? do
       expects_command_to_pass
     end
   end
-
-  context 'when showing' do
-    before do
-      ssl.command_line.args << 'show'
-      File.write(Puppet[:hostcert], @host[:cert].to_pem)
-    end
-
-    it 'reports if the key is missing' do
-      File.delete(Puppet[:hostprivkey])
-
-      expects_command_to_fail(/The private key is missing from/)
-    end
-
-    it 'reports if the cert is missing' do
-      File.delete(Puppet[:hostcert])
-
-      expects_command_to_fail(/The client certificate is missing from/)
-    end
-
-    it 'prints certificate information' do
-      expects_command_to_pass(@host[:cert].to_text)
-    end
-  end
 end

data/spec/unit/application_spec.rb

@@ -7,10 +7,8 @@ require 'timeout'
 
 describe Puppet::Application do
   before(:each) do
-    @appclass = Class.new(Puppet::Application) do
-      def handle_unknown(opt, arg); end
-    end
-    @app = @appclass.new
+    @app = Class.new(Puppet::Application).new
+    @appclass = @app.class
 
     allow(@app).to receive(:name).and_return("test_app")
   end
@@ -513,40 +511,6 @@ describe Puppet::Application do
 
       expect { @app.configure_indirector_routes }.to raise_error(Puppet::Error, /mapping values are not allowed/)
     end
-
-    it "should treat master routes on server application" do
-      allow(@app).to receive(:name).and_return("server")
-
-      Puppet[:route_file] = tmpfile('routes')
-      File.open(Puppet[:route_file], 'w') do |f|
-        f.print <<-ROUTES
-          master:
-            node:
-              terminus: exec
-        ROUTES
-      end
-
-      @app.configure_indirector_routes
-
-      expect(Puppet::Node.indirection.terminus_class).to eq('exec')
-    end
-
-    it "should treat server routes on master application" do
-      allow(@app).to receive(:name).and_return("master")
-
-      Puppet[:route_file] = tmpfile('routes')
-      File.open(Puppet[:route_file], 'w') do |f|
-        f.print <<-ROUTES
-          server:
-            node:
-              terminus: exec
-        ROUTES
-      end
-
-      @app.configure_indirector_routes
-
-      expect(Puppet::Node.indirection.terminus_class).to eq('exec')
-    end
   end
 
   describe "when running" do
@@ -596,6 +560,13 @@ describe Puppet::Application do
     end
 
     it "should raise an error if dispatch returns no command" do
+      allow(@app).to receive(:get_command).and_return(nil)
+      expect(Puppet).to receive(:send_log).with(:err, "Could not run: No valid command or main")
+      expect { @app.run }.to exit_with 1
+    end
+
+    it "should raise an error if dispatch returns an invalid command" do
+      allow(@app).to receive(:get_command).and_return(:this_function_doesnt_exist)
       expect(Puppet).to receive(:send_log).with(:err, "Could not run: No valid command or main")
       expect { @app.run }.to exit_with 1
     end
@@ -713,18 +684,5 @@ describe Puppet::Application do
 
       @app.handle_logdest_arg(nil)
     end
-
-    it "accepts multiple destinations as a comma sepparated list" do
-      dest1 = '/tmp/path1'
-      dest2 = 'console'
-      dest3 = '/tmp/path2'
-      dest_args = [dest1, dest2, dest3].join(' , ')
-
-      [dest1, dest2, dest3].each do |dest|
-        expect(Puppet::Util::Log).to receive(:newdestination).with(dest)
-      end
-
-      @app.handle_logdest_arg(dest_args)
-    end
   end
 end

data/spec/unit/certificate_factory_spec.rb

@@ -7,7 +7,7 @@ describe Puppet::CertificateFactory, :unless => RUBY_PLATFORM == 'java' do
   let :serial    do OpenSSL::BN.new('12') end
   let :name      do "example.local" end
   let :x509_name do OpenSSL::X509::Name.new([['CN', name]]) end
-  let :key       do Puppet::SSL::Key.new(name).generate end
+  let :key       do OpenSSL::PKey::RSA.new(Puppet[:keylength]) end
   let :csr       do
     csr = Puppet::SSL::CertificateRequest.new(name)
     csr.generate(key)

data/spec/unit/configurer/downloader_spec.rb

@@ -81,12 +81,6 @@ describe Puppet::Configurer::Downloader do
       expect(file[:source_permissions]).to eq(:ignore)
     end
 
-    it "should ignore the max file limit" do
-      file = generate_file_resource
-
-      expect(file[:max_files]).to eq(-1)
-    end
-
     describe "on POSIX", :if => Puppet.features.posix? do
       it "should allow source_permissions to be overridden" do
         file = generate_file_resource(:source_permissions => :use)
@@ -195,6 +189,8 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should return all changed file paths" do
+      Puppet[:ignore_plugin_errors] = true
+
       trans = double('transaction')
 
       catalog = double('catalog')
@@ -210,6 +206,8 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should yield the resources if a block is given" do
+      Puppet[:ignore_plugin_errors] = true
+
       trans = double('transaction')
 
       catalog = double('catalog')
@@ -227,6 +225,8 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should catch and log exceptions" do
+      Puppet[:ignore_plugin_errors] = true
+
       expect(Puppet).to receive(:log_exception)
       # The downloader creates a new catalog for each apply, and really the only object
       # that it is possible to stub for the purpose of generating a puppet error
@@ -236,8 +236,6 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "raises an exception if catalog application fails" do
-      Puppet[:ignore_plugin_errors] = false
-
       expect(@dler.file).to receive(:retrieve).and_raise(Puppet::Error, "testing")
 
       expect {

data/spec/unit/configurer/plugin_handler_spec.rb

@@ -19,30 +19,68 @@ describe Puppet::Configurer::PluginHandler do
       end
     end
 
-    it "downloads plugins, facts, and locales" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { times_called += 1 }.and_return([])
+    context "when i18n is enabled" do
+      before :each do
+        Puppet[:disable_i18n] = false
+      end
 
-      pluginhandler.download_plugins(environment)
-      expect(times_called).to eq(3)
-    end
+      it "downloads plugins, facts, and locales" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { times_called += 1 }.and_return([])
 
-    it "returns downloaded plugin, fact, and locale filenames" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
-        times_called += 1
+        pluginhandler.download_plugins(environment)
+        expect(times_called).to eq(3)
+      end
 
-        if times_called == 1
-          %w[/a]
-        elsif times_called == 2
-          %w[/b]
-        else
-          %w[/c]
+      it "returns downloaded plugin, fact, and locale filenames" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
+          times_called += 1
+
+          if times_called == 1
+            %w[/a]
+          elsif times_called == 2
+            %w[/b]
+          else
+            %w[/c]
+          end
         end
+
+        expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b /c])
+        expect(times_called).to eq(3)
+      end
+    end
+
+    context "when i18n is disabled" do
+      before :each do
+        Puppet[:disable_i18n] = true
+      end
+
+      it "downloads plugins, facts, but no locales" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { times_called += 1 }.and_return([])
+
+        pluginhandler.download_plugins(environment)
+        expect(times_called).to eq(2)
       end
 
-      expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b /c])
-      expect(times_called).to eq(3)
+      it "returns downloaded plugin, fact, and locale filenames" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
+          times_called += 1
+
+          if times_called == 1
+            %w[/a]
+          elsif times_called == 2
+            %w[/b]
+          else
+            %w[/c]
+          end
+        end
+
+        expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
+        expect(times_called).to eq(2)
+      end
     end
   end