puppet 6.16.0 → 7.0.0

data/man/man8/puppet-resource.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "May 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "November 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

data/man/man8/puppet-script.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SCRIPT" "8" "May 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "November 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog

data/man/man8/puppet-ssl.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SSL" "8" "May 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SSL" "8" "November 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-ssl\fR \- Manage SSL keys and certificates for puppet SSL clients

data/man/man8/puppet.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "May 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "November 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
@@ -25,4 +25,4 @@ Specialized:
 catalog Compile, save, view, and convert catalogs\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.16\.0
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v7\.0\.0

data/spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb

@@ -0,0 +1,2 @@
+Puppet::Type.type(:applytest).provide(:applytest) do
+end

data/spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb

@@ -0,0 +1,25 @@
+# If you make changes to this file, regenerate the pcore resource type using
+# bundle exec puppet generate types --environmentpath spec/fixtures/integration/application/apply/environments -E spec
+Puppet::Type.newtype(:applytest) do
+  newproperty(:message) do
+    def sync
+      Puppet.send(@resource[:loglevel], self.should)
+    end
+
+    def retrieve
+      :absent
+    end
+
+    def insync?(is)
+      false
+    end
+
+    defaultto { @resource[:name] }
+  end
+
+  newparam(:name) do
+    desc "An arbitrary tag for your own reference; the name of the message."
+    Puppet.notice('the Puppet::Type says hello')
+    isnamevar
+  end
+end

data/spec/fixtures/unit/forge/bacula-releases.json

@@ -0,0 +1,128 @@
+{
+  "pagination": {
+    "limit": 20,
+    "offset": 0,
+    "first": "/v3/releases?module=puppetlabs-bacula&sort_by=version&exclude_fields=readme%2Cchangelog%2Clicense%2Curi%2Cmodule%2Ctags%2Csupported%2Cfile_size%2Cdownloads%2Ccreated_at%2Cupdated_at%2Cdeleted_at&limit=20&offset=0",
+    "previous": null,
+    "current": "/v3/releases?module=puppetlabs-bacula&sort_by=version&exclude_fields=readme%2Cchangelog%2Clicense%2Curi%2Cmodule%2Ctags%2Csupported%2Cfile_size%2Cdownloads%2Ccreated_at%2Cupdated_at%2Cdeleted_at&limit=20&offset=0",
+    "next": null,
+    "total": 2
+  },
+  "results": [
+    {
+      "slug": "puppetlabs-bacula-0.0.2",
+      "version": "0.0.2",
+      "metadata": {
+        "description": "This module manages Bacula, a complete backup solution",
+        "source": "http://github.com/puppetlabs/puppetlabs-bacula",
+        "checksums": {
+          "templates/client_config.erb": "5d4005eda5ace78fd90a8cb6dcb388bd",
+          "spec/spec_helper.rb": "ca19ec4f451ebc7fdb035b52eae6e909",
+          "templates/bacula-fd.conf.erb": "344fff616e138fbf8cd150f4bab8125d",
+          "CHANGELOG": "a20043858790de6086b9b30c36806cd2",
+          "manifests/config/validate.pp": "7d2f9f7cffb2bd1d221eb699ea55f246",
+          "LICENSE": "26ce13c80c7a8493533c65c32dc29f09",
+          "manifests/director.pp": "36f34f749314634173b6a47b92a58421",
+          "manifests/config/client.pp": "5d25cbfd94be2829d9d530673cd2307f",
+          "lib/puppet/parser/functions/generate_clients.rb": "e09d77f88d18ec3e59bbe7bae4a48036",
+          "manifests/common.pp": "67391e5560ee7fc97d873ab5c3e2f84c",
+          "manifests/client.pp": "42e9255711d0a6abed6ab8deafb1248c",
+          "manifests/console.pp": "4cf8ac2f96f9268e2a3d70ed777797b7",
+          "README.md": "13d0f1119d510e41c539cbc3825a4f82",
+          "templates/bacula-sd.conf.erb": "df7987695bf1dd18bb789a2673b2cd95",
+          "manifests/config.pp": "624a225f85f907e7db5cf717561953f3",
+          "tests/init.pp": "b95d199119d5e592df7e1580bf23fe06",
+          "templates/bconsole.conf.erb": "ba5e1ef7d320a48bde6e403dc956952a",
+          "manifests/bat.pp": "3743bddf0197b4110e54a8e297e927e8",
+          "manifests/storage.pp": "84f4ec1413df4fdec7288c18d6ba2897",
+          "templates/bacula-dir.conf.erb": "5ab5aa263cf318ebf65c6b52a0726647",
+          "metadata.json": "d34d0b70aba36510fbc2df4e667479ef",
+          "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
+          "Modulefile": "63f93af605871a69211cd3f79ac62582",
+          "manifests/init.pp": "fafac38161dd69f4b7e452cf910812f4"
+        },
+        "summary": "This module manages a bacula infrastructure",
+        "author": "Puppet Labs",
+        "dependencies": [
+
+        ],
+        "project_page": "http://github.com/puppetlabs/puppetlabs-bacula",
+        "types": [
+
+        ],
+        "license": "Apache",
+        "version": "0.0.2",
+        "name": "puppetlabs-bacula"
+      },
+      "pdk": false,
+      "validation_score": 22,
+      "file_uri": "/v3/files/puppetlabs-bacula-0.0.2.tar.gz",
+      "file_md5": "6cd7b8a3ec788e4ddbd06ae59be45d7a",
+      "file_sha256": "4cea5bae3c2b3dbe236bdc87ab9caa4f6d41943d1bf81651b2c0e08205910cdd",
+      "reference": null,
+      "tasks": [
+
+      ],
+      "plans": [
+
+      ],
+      "deleted_for": null
+    },
+    {
+      "slug": "puppetlabs-bacula-0.0.1",
+      "version": "0.0.1",
+      "metadata": {
+        "description": "This module manages Bacula, a complete backup solution",
+        "source": "http://github.com/puppetlabs/puppetlabs-bacula",
+        "checksums": {
+          "spec/spec_helper.rb": "ca19ec4f451ebc7fdb035b52eae6e909",
+          "templates/bacula-fd.conf.erb": "344fff616e138fbf8cd150f4bab8125d",
+          "CHANGELOG": "28c8a36d149971979b867491203b5fef",
+          "manifests/config/validate.pp": "e74d9dfbf4814d455a2c4a27ac516571",
+          "LICENSE": "26ce13c80c7a8493533c65c32dc29f09",
+          "manifests/director.pp": "bec6d5b6b8befca9640edb8bdb8b5b10",
+          "manifests/common.pp": "9c037f51fd8b70c4bed0ceeb55f93ffb",
+          "manifests/client.pp": "42e9255711d0a6abed6ab8deafb1248c",
+          "manifests/console.pp": "1ee546361e47c0bc43299b3b62baa925",
+          "README.md": "470c6e1e9b4d877bcfdc88d751de8d19",
+          "templates/bacula-sd.conf.erb": "df7987695bf1dd18bb789a2673b2cd95",
+          "manifests/config.pp": "4410fadc6d82543e0b19039e3365fd3a",
+          "tests/init.pp": "b95d199119d5e592df7e1580bf23fe06",
+          "templates/bconsole.conf.erb": "ba5e1ef7d320a48bde6e403dc956952a",
+          "manifests/bat.pp": "3743bddf0197b4110e54a8e297e927e8",
+          "manifests/storage.pp": "13eadb4376a07d095d1ee13e8ff60846",
+          "templates/bacula-dir.conf.erb": "c0b1b57660cf965bcff7e5fda547ee03",
+          "metadata.json": "d34d0b70aba36510fbc2df4e667479ef",
+          "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
+          "Modulefile": "082b764ac91831266b7cbda75f79c199",
+          "manifests/init.pp": "6b9d2e9ca0a06c1a318837307fadcc70"
+        },
+        "summary": "This module manages a bacula infrastructure",
+        "author": "Puppet Labs",
+        "dependencies": [
+
+        ],
+        "project_page": "http://github.com/puppetlabs/puppetlabs-bacula",
+        "types": [
+
+        ],
+        "license": "Apache",
+        "version": "0.0.1",
+        "name": "puppetlabs-bacula"
+      },
+      "pdk": false,
+      "validation_score": 38,
+      "file_uri": "/v3/files/puppetlabs-bacula-0.0.1.tar.gz",
+      "file_md5": "c29882cf29eff17f18dcb74cc544c200",
+      "file_sha256": "7a68af4ab6e413a1cb3ec1694ddc3956138aa4c34d97abbe61a50947d0b12069",
+      "reference": null,
+      "tasks": [
+
+      ],
+      "plans": [
+
+      ],
+      "deleted_for": null
+    }
+  ]
+}

data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages

@@ -0,0 +1,30 @@
+concurrent-ruby (1.1.5)
+
+deep_merge (1.0.1)
+
+fast_gettext (1.1.2)
+
+gettext (3.2.2)
+
+hiera-eyaml (3.2.0)
+
+highline (1.6.21)
+
+hocon (1.3.1, 1.2.5)
+
+locale (2.1.3, 2.1.2)
+
+multi_json (1.14.1)
+
+optimist (3.0.1)
+
+puppet-resource_api (1.8.13)
+
+puppetserver-ca (1.8.0)
+
+semantic_puppet (1.0.2)
+
+text (1.3.1)
+
+world_airports (1.1.3)
+

data/spec/integration/application/agent_spec.rb

@@ -15,21 +15,17 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
   let(:formatter) { Puppet::Network::FormatHandler.format(:rich_data_json) }
 
   context 'server_list' do
-    before :each do
-      Puppet[:log_level] = 'debug'
-    end
-
     it "uses the first server in the list" do
       Puppet[:server_list] = '127.0.0.1'
+      Puppet[:log_level] = 'debug'
 
       server.start_server do |port|
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         expect {
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(0)
-        }.to output(%r{HTTP GET https://127.0.0.1:#{port}/status/v1/simple/master returned 200 OK}).to_stdout
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(0)
+         .and output(%r{HTTP GET https://127.0.0.1:#{port}/status/v1/simple/server returned 200 OK}).to_stdout
       end
     end
 
@@ -37,16 +33,16 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       Puppet[:server_list] = "puppet.example.com,#{Puppet[:server]}"
 
       server.start_server do |port|
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         expect {
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(0)
-        }.to output(%r{Unable to connect to server from server_list setting: Request to https://puppet.example.com:#{port}/status/v1/simple/master failed}).to_stdout
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(0)
+         .and output(%r{Notice: Applied catalog}).to_stdout
+         .and output(%r{Unable to connect to server from server_list setting: Request to https://puppet.example.com:#{port}/status/v1/simple/server failed}).to_stderr
 
         report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
-        expect(report.master_used).to eq("127.0.0.1:#{port}")
+        expect(report.server_used).to eq("127.0.0.1:#{port}")
       end
     end
 
@@ -54,32 +50,49 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       Puppet[:server_list] = "puppet.example.com"
 
       expect {
-        expect {
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(1)
-        }.to output(%r{Unable to connect to server from server_list setting: Could not select a functional puppet master from server_list: 'puppet.example.com'}).to_stdout
-      }.to output(/Error: Could not run Puppet configuration client: Could not select a functional puppet master from server_list: 'puppet.example.com'/).to_stderr
+        agent.command_line.args << '--test'
+        agent.run
+      }.to exit_with(1)
+       .and output(a_string_matching(%r{Unable to connect to server from server_list setting})
+       .and matching(/Error: Could not run Puppet configuration client: Could not select a functional puppet server from server_list: 'puppet.example.com'/)).to_stderr
 
       # I'd expect puppet to update the last run report even if the server_list was
       # exhausted, but it doesn't work that way currently, see PUP-6708
       expect(File).to_not be_exist(Puppet[:lastrunreport])
     end
 
-    it "omits master_used when not using server_list" do
+    it "omits server_used when not using server_list" do
+      Puppet[:log_level] = 'debug'
+
       server.start_server do |port|
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         expect {
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(0)
-        }.to output(%r{Resolved service 'puppet' to https://127.0.0.1:#{port}/puppet/v3}).to_stdout
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(0)
+         .and output(%r{Resolved service 'puppet' to https://127.0.0.1:#{port}/puppet/v3}).to_stdout
       end
 
       report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
-      expect(report.master_used).to be_nil
+      expect(report.server_used).to be_nil
+    end
+
+    it "server_list takes precedence over server" do
+      Puppet[:server] = 'notvalid.example.com'
+      Puppet[:log_level] = 'debug'
+
+      server.start_server do |port|
+        Puppet[:server_list] = "127.0.0.1:#{port}"
+
+        expect {
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(0)
+         .and output(%r{Debug: Resolved service 'puppet' to https://127.0.0.1:#{port}/puppet/v3}).to_stdout
+
+        report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
+        expect(report.server_used).to eq("127.0.0.1:#{port}")
+      end
     end
   end
 
@@ -97,13 +110,12 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       }
 
       server.start_server(mounts: {catalog: catalog_handler}) do |port|
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         expect {
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(2)
-        }.to output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred\]/message: defined 'message' as '1:2:3'}).to_stdout
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(2)
+         .and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred\]/message: defined 'message' as '1:2:3'}).to_stdout
       end
     end
 
@@ -120,19 +132,40 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       }
 
       server.start_server(mounts: {catalog: catalog_handler}) do |port|
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         expect {
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(2)
-        }.to output(a_string_matching(
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(2)
+         .and output(a_string_matching(
           /Notice: Sensitive \[value redacted\]/
         ).and matching(
           /Notify\[sensitive\]\/message: changed \[redacted\] to \[redacted\]/
         )).to_stdout
       end
     end
+
+    it "applies binary data in a cached catalog" do
+      catalog = compile_to_catalog(<<-MANIFEST, node)
+          notify { 'some title':
+            message => Binary.new('aGk=')
+          }
+        MANIFEST
+
+      catalog_dir = File.join(Puppet[:client_datadir], 'catalog')
+      Puppet::FileSystem.mkpath(catalog_dir)
+      cached_catalog = "#{File.join(catalog_dir, Puppet[:certname])}.json"
+      File.write(cached_catalog, catalog.render(:rich_data_json))
+
+      expect {
+        Puppet[:report] = false
+        Puppet[:use_cached_catalog] = true
+        Puppet[:usecacheonfailure] = false
+        agent.command_line.args << '-t'
+        agent.run
+      }.to exit_with(2)
+       .and output(%r{defined 'message' as 'hi'}).to_stdout
+    end
   end
 
   context 'static catalogs' do
@@ -163,7 +196,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       }
 
       server.start_server(mounts: {catalog: catalog_handler}) do |port|
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         expect {
           expect {
             agent.command_line.args << '--test'
@@ -208,13 +241,12 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       }
 
       server.start_server(mounts: mounts) do |port|
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         expect {
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(2)
-        }.to output(/content changed '{md5}d41d8cd98f00b204e9800998ecf8427e' to '{md5}4cf49285ae567157ebfba72bd04ccf32'/).to_stdout
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(2)
+         .and output(/content changed '{sha256}e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' to '{sha256}3bef83ad320b471d8e3a03c9b9f150749eea610fe266560395d3195cfbd8e6b8'/).to_stdout
 
         # verify puppet restored binary content
         expect(File.binread(path)).to eq(binary_content)
@@ -257,7 +289,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
         }
 
         server.start_server(mounts: {catalog: catalog_handler}) do |puppetserver_port|
-          Puppet[:masterport] = puppetserver_port
+          Puppet[:serverport] = puppetserver_port
 
           # override path to system cacert bundle, this must be done before
           # the SSLContext is created and the call to X509::Store.set_default_paths
@@ -309,7 +341,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
         }
 
         server.start_server(mounts: {catalog: catalog_handler}) do |puppetserver_port|
-          Puppet[:masterport] = puppetserver_port
+          Puppet[:serverport] = puppetserver_port
 
           # override path to system cacert bundle, this must be done before
           # the SSLContext is created and the call to X509::Store.set_default_paths
@@ -325,6 +357,56 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
         end
       end
     end
+
+    it 'accepts HTTPS servers whose cert is in the external CA store' do
+      unknown_ca_cert = cert_fixture('unknown-ca.pem')
+      https = PuppetSpec::HTTPSServer.new(
+        ca_cert: unknown_ca_cert,
+        server_cert: cert_fixture('unknown-127.0.0.1.pem'),
+        server_key: key_fixture('unknown-127.0.0.1-key.pem')
+      )
+
+      # create a temp cacert bundle
+      ssl_file = tmpfile('systemstore')
+      File.write(ssl_file, unknown_ca_cert.to_pem)
+
+      response_proc = -> (req, res) {
+        res.status = 200
+        res.body = response_body
+      }
+
+      https.start_server(response_proc: response_proc) do |https_port|
+        catalog_handler = -> (req, res) {
+          catalog = compile_to_catalog(<<-MANIFEST, node)
+            file { "#{path}":
+              ensure => file,
+              backup => false,
+              checksum => sha1,
+              checksum_value => '#{digest}',
+              source => "https://127.0.0.1:#{https_port}/path/to/file"
+            }
+          MANIFEST
+
+          res.body = formatter.render(catalog)
+          res['Content-Type'] = formatter.mime
+        }
+
+        server.start_server(mounts: {catalog: catalog_handler}) do |puppetserver_port|
+          Puppet[:serverport] = puppetserver_port
+
+          # set path to external cacert bundle, this must be done before
+          # the SSLContext is created
+          Puppet[:ssl_trust_store] = ssl_file
+          expect {
+            agent.command_line.args << '--test'
+            agent.run
+          }.to exit_with(2)
+           .and output(%r{https_file_source.*/ensure: created}).to_stdout
+        end
+
+        expect(File.binread(path)).to eq("from https server")
+      end
+    end
   end
 
   context 'multiple agents running' do
@@ -332,7 +414,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       path = Puppet[:agent_catalog_run_lockfile]
 
       th = Thread.new {
-        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(2)"}
+        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(20)"}
       }
 
       until File.exists?(path) && File.size(path) > 0 do
@@ -349,12 +431,23 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
 
     it "waits for other agent run to finish before starting" do
       server.start_server do |port|
+        script = tmpfile('wait_for_log_entry')
+        logdest = tmpfile('agent_log')
         path = Puppet[:agent_catalog_run_lockfile]
-        Puppet[:masterport] = port
+        Puppet[:serverport] = port
         Puppet[:waitforlock] = 1
 
         th = Thread.new {
-          %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(2)"}
+          File.write(script, <<~SCRIPT)
+            $0 = 'puppet'
+            # lock pidfile
+            File.write('#{path}', Process.pid)
+            # wait for foreground agent to fail once
+            until File.exists?("#{logdest}") && File.readlines("#{logdest}").grep(/Will try again/).any? do
+              sleep 0.1
+            end
+          SCRIPT
+          %x{ruby '#{script}'}
         }
 
         until File.exists?(path) && File.size(path) > 0 do
@@ -362,9 +455,14 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
         end
 
         expect {
-          agent.command_line.args << '--test'
+          agent.command_line.args << '--test' << '--logdest' << logdest << '--logdest' << 'console'
           agent.run
-        }.to exit_with(0).and output(/Info: Will try again in #{Puppet[:waitforlock]} seconds./).to_stdout
+        }.to exit_with(0)
+         .and output(a_string_matching(
+          /Info: Will try again in #{Puppet[:waitforlock]} seconds/
+        ).and matching(
+          /Applied catalog/
+        )).to_stdout
 
         th.kill # kill thread so we don't wait too much
       end
@@ -376,7 +474,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       Puppet[:maxwaitforlock] = 0
 
       th = Thread.new {
-        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(2)"}
+        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(20)"}
       }
 
       until File.exists?(path) && File.size(path) > 0 do