beaker 4.39.0 → 5.1.0

data/spec/helpers.rb

@@ -19,9 +19,8 @@ module TestFileHelpers
                     :solaris_hypervisor_snappaths => ["rpoooool/USER/z0"],
                     :vsphere_server => "vsphere.labs.net",
                     :vsphere_username => "vsphere@labs.com",
-                    :vsphere_password => "supersekritpassword"} }
+                    :vsphere_password => "supersekritpassword", } }
   end
-
 end
 
 module HostHelpers
@@ -35,8 +34,7 @@ module HostHelpers
                     :box_url => 'http://default.box.url',
                     :image => 'default_image',
                     :flavor => 'm1.large',
-                    :user_data => '#cloud-config\nmanage_etc_hosts: true\nfinal_message: "The host is finally up!"'
-  }
+                    :user_data => '#cloud-config\nmanage_etc_hosts: true\nfinal_message: "The host is finally up!"', }
 
   HOST_NAME     = "vm%d"
   HOST_SNAPSHOT = "snapshot%d"
@@ -48,55 +46,55 @@ module HostHelpers
   HOST_PRIVATE_IP = "private.ip.for.%s"
 
   def logger
-    double( 'logger' ).as_null_object
+    double('logger').as_null_object
   end
 
   def make_opts
     opts = Beaker::Options::Presets.new
-    opts.presets.merge( opts.env_vars ).merge( { :logger => logger,
-                                               :host_config => 'sample.config',
-                                               :type => nil,
-                                               :pooling_api => 'http://vcloud.delivery.puppetlabs.net/',
-                                               :datastore => 'instance0',
-                                               :folder => 'Delivery/Quality Assurance/Staging/Dynamic',
-                                               :resourcepool => 'delivery/Quality Assurance/Staging/Dynamic',
-                                               :gce_project => 'beaker-compute',
-                                               :gce_keyfile => '/path/to/keyfile.p12',
-                                               :gce_password => 'notasecret',
-                                               :gce_email => '12345678910@developer.gserviceaccount.com',
-                                               :openstack_api_key => "P1as$w0rd",
-                                               :openstack_username => "user",
-                                               :openstack_auth_url => "http://openstack_hypervisor.labs.net:5000/v2.0/tokens",
-                                               :openstack_tenant => "testing",
-                                               :openstack_network => "testing",
-                                               :openstack_keyname => "nopass",
-                                               :floating_ip_pool => "my_pool",
-                                               :security_group => ['my_sg', 'default'] } )
+    opts.presets.merge(opts.env_vars).merge({ :logger => logger,
+                                              :host_config => 'sample.config',
+                                              :type => nil,
+                                              :pooling_api => 'http://vcloud.delivery.puppetlabs.net/',
+                                              :datastore => 'instance0',
+                                              :folder => 'Delivery/Quality Assurance/Staging/Dynamic',
+                                              :resourcepool => 'delivery/Quality Assurance/Staging/Dynamic',
+                                              :gce_project => 'beaker-compute',
+                                              :gce_keyfile => '/path/to/keyfile.p12',
+                                              :gce_password => 'notasecret',
+                                              :gce_email => '12345678910@developer.gserviceaccount.com',
+                                              :openstack_api_key => "P1as$w0rd",
+                                              :openstack_username => "user",
+                                              :openstack_auth_url => "http://openstack_hypervisor.labs.net:5000/v2.0/tokens",
+                                              :openstack_tenant => "testing",
+                                              :openstack_network => "testing",
+                                              :openstack_keyname => "nopass",
+                                              :floating_ip_pool => "my_pool",
+                                              :security_group => %w[my_sg default], })
   end
 
-  def generate_result (name, opts )
-    result = double( 'result' )
+  def generate_result(name, opts)
+    result = double('result')
     stdout = opts.has_key?(:stdout) ? opts[:stdout] : name
     stderr = opts.has_key?(:stderr) ? opts[:stderr] : name
-    exit_code = opts.has_key?(:exit_code) ? opts[:exit_code] :  0
+    exit_code = opts.has_key?(:exit_code) ? opts[:exit_code] : 0
     exit_code = [exit_code].flatten
-    allow( result ).to receive( :stdout ).and_return( stdout )
-    allow( result ).to receive( :stderr ).and_return( stderr )
-    allow( result ).to receive( :exit_code ).and_return( *exit_code )
+    allow(result).to receive(:stdout).and_return(stdout)
+    allow(result).to receive(:stderr).and_return(stderr)
+    allow(result).to receive(:exit_code).and_return(*exit_code)
     result
   end
 
   def make_host_opts name, opts
-    make_opts.merge( { 'HOSTS' => { name => opts } } ).merge( opts )
+    make_opts.merge({ 'HOSTS' => { name => opts } }).merge(opts)
   end
 
   def make_host name, host_hash
     host_hash = Beaker::Options::OptionsHash.new.merge(HOST_DEFAULTS.merge(host_hash))
 
-    host = Beaker::Host.create( name, host_hash, make_opts)
+    host = Beaker::Host.create(name, host_hash, make_opts)
 
-    allow(host).to receive( :exec ).and_return( generate_result( name, host_hash ) )
-    allow(host).to receive( :close )
+    allow(host).to receive(:exec).and_return(generate_result(name, host_hash))
+    allow(host).to receive(:close)
     host
   end
 
@@ -110,7 +108,7 @@ module HostHelpers
                :dns_name => HOST_DNS_NAME % name,
                :template => HOST_TEMPLATE % name,
                :box => HOST_BOX % name,
-               :box_url => HOST_BOX_URL % name }.merge( preset_opts )
+               :box_url => HOST_BOX_URL % name, }.merge(preset_opts)
       hosts << make_host(name, opts)
     end
     hosts
@@ -119,29 +117,26 @@ module HostHelpers
   def make_instance instance_data = {}
     OpenStruct.new instance_data
   end
-
 end
 
 module PlatformHelpers
-
-  DEBIANPLATFORMS = ['debian',
-                     'ubuntu',
-                     'cumulus',
-                     'huaweios']
-
+  DEBIANPLATFORMS = %w[debian
+                       ubuntu
+                       cumulus
+                       huaweios]
 
   FEDORASYSTEMD    = (14..39).to_a.collect! { |i| "fedora-#{i}" }
 
-  SYSTEMDPLATFORMS = ['el-7',
-                      'centos-7',
-                      'redhat-7',
-                      'oracle-7',
-                      'scientific-7',
-                      'eos-7',
-                      'el-8',
-                      'centos-8',
-                      'redhat-8',
-                      'oracle-8'].concat(FEDORASYSTEMD)
+  SYSTEMDPLATFORMS = %w[el-7
+                        centos-7
+                        redhat-7
+                        oracle-7
+                        scientific-7
+                        eos-7
+                        el-8
+                        centos-8
+                        redhat-8
+                        oracle-8].concat(FEDORASYSTEMD)
 
   FEDORASYSTEMV    = (1..13).to_a.collect! { |i| "fedora-#{i}" }
 
@@ -151,5 +146,5 @@ module PlatformHelpers
                       'redhat',
                       'oracle',
                       'scientific',
-                      'eos'].concat(FEDORASYSTEMV)
+                      'eos',].concat(FEDORASYSTEMV)
 end

data/spec/matchers.rb

@@ -1,6 +1,7 @@
 RSpec::Matchers.define :execute_commands_matching do |pattern|
   match do |actual|
-    raise(RuntimeError, "Expected #{actual} to be a FakeHost") unless actual.kind_of?(FakeHost::MockedExec)
+    raise(RuntimeError, "Expected #{actual} to be a FakeHost") unless actual.is_a?(FakeHost::MockedExec)
+
     @found_count = actual.command_strings.grep(pattern).size
     @times.nil? ?
       @found_count > 0 :
@@ -20,11 +21,11 @@ RSpec::Matchers.define :execute_commands_matching do |pattern|
   end
 
   def message(actual, pattern, times, found_count)
-      msg = times == 1 ?
-        "#{pattern} once" :
-        "#{pattern} #{times} times"
-      msg += " but instead found a count of #{found_count}" if found_count != times
-      msg + " in:\n #{actual.command_strings.pretty_inspect}"
+    msg = times == 1 ?
+      "#{pattern} once" :
+      "#{pattern} #{times} times"
+    msg += " but instead found a count of #{found_count}" if found_count != times
+    msg + " in:\n #{actual.command_strings.pretty_inspect}"
   end
 
   failure_message do |actual|
@@ -38,7 +39,7 @@ end
 
 RSpec::Matchers.define :execute_commands_matching_in_order do |*patterns|
   match do |actual|
-    raise(RuntimeError, "Expected #{actual} to be a FakeHost") unless actual.kind_of?(FakeHost::MockedExec)
+    raise(RuntimeError, "Expected #{actual} to be a FakeHost") unless actual.is_a?(FakeHost::MockedExec)
 
     remaining_patterns = patterns.clone
     actual.command_strings.each do |line|

data/spec/mocks.rb

@@ -2,7 +2,6 @@ require 'rspec/mocks'
 
 module MockNet
   class HTTP
-
     class Response
       class ResponseHash
         def []key
@@ -12,13 +11,11 @@ module MockNet
             { 'ok' => true, 'hostname' => 'pool' }
           end
         end
-
       end
 
       def body
         ResponseHash.new
       end
-
     end
 
     class Post
@@ -56,7 +53,6 @@ module MockNet
       Response.new
     end
   end
-
 end
 
 module FakeHost
@@ -65,13 +61,12 @@ module FakeHost
   def self.create(name = 'fakevm', platform = 'redhat-version-arch', options = {})
     options_hash = Beaker::Options::OptionsHash.new.merge(options)
     options_hash[:logger] = RSpec::Mocks::Double.new('logger').as_null_object
-    host = Beaker::Host.create(name, { 'platform' => Beaker::Platform.new(platform) } , options_hash)
+    host = Beaker::Host.create(name, { 'platform' => Beaker::Platform.new(platform) }, options_hash)
     host.extend(MockedExec)
     host
   end
 
   module MockedExec
-
     def self.extended(other)
       other.instance_eval do
         send(:instance_variable_set, :@commands, [])

data/spec/spec_helper.rb

@@ -27,7 +27,6 @@ require 'fakefs/spec_helpers'
 require 'mocks'
 require 'helpers'
 require 'matchers'
-require 'rspec/its'
 
 RSpec.configure do |config|
   config.include FakeFS::SpecHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.39.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-18 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -202,30 +188,22 @@ dependencies:
   name: in-parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: open_uri_redirections
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement
@@ -385,7 +363,6 @@ files:
 - acceptance/tests/base/dsl/helpers/host_helpers/create_remote_file_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/curl_on_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/curl_with_retries_test.rb
-- acceptance/tests/base/dsl/helpers/host_helpers/deploy_package_repo_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/echo_on_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/install_package_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/on_test.rb
@@ -400,7 +377,6 @@ files:
 - acceptance/tests/base/dsl/helpers/host_helpers/upgrade_package_test.rb
 - acceptance/tests/base/dsl/platform_tag_confiner_test.rb
 - acceptance/tests/base/dsl/structure_test.rb
-- acceptance/tests/base/external_resources_test.rb
 - acceptance/tests/base/host/file_test.rb
 - acceptance/tests/base/host/group_test.rb
 - acceptance/tests/base/host/host_test.rb
@@ -559,6 +535,7 @@ files:
 - lib/beaker/test_suite.rb
 - lib/beaker/test_suite_result.rb
 - lib/beaker/version.rb
+- rubocop.yml
 - spec/beaker/cli_spec.rb
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
@@ -578,7 +555,6 @@ files:
 - spec/beaker/host/mac/exec_spec.rb
 - spec/beaker/host/mac/group_spec.rb
 - spec/beaker/host/mac/user_spec.rb
-- spec/beaker/host/mac_spec.rb
 - spec/beaker/host/pswindows/exec_spec.rb
 - spec/beaker/host/pswindows/file_spec.rb
 - spec/beaker/host/pswindows/user_spec.rb
@@ -641,7 +617,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/acceptance/tests/base/dsl/helpers/host_helpers/deploy_package_repo_test.rb

@@ -1,142 +0,0 @@
-require "helpers/test_helper"
-require "fileutils"
-
-test_name "dsl::helpers::host_helpers #deploy_package_repo" do
-
-  confine_block :to, :platform => /^el-4/ do
-
-    step "#deploy_package_repo CURRENTLY does nothing and throws no error on the #{default['platform']} platform" do
-      # NOTE: would expect this to fail with Beaker::Host::CommandFailure
-
-      Dir.mktmpdir do |local_dir|
-        name = "puppet-server"
-        version = "9.9.9"
-        platform = default['platform']
-
-        create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
-
-        assert_nil deploy_package_repo(default, local_dir, name, version)
-      end
-    end
-  end
-
-  confine_block :to, :platform => /fedora|centos|eos|el-[56789]/i do
-
-    step "#deploy_package_repo pushes repo package to /etc/yum.repos.d on the remote host" do
-      Dir.mktmpdir do |local_dir|
-        name = "puppet-server"
-        version = "9.9.9"
-        platform = default['platform']
-
-        FileUtils.mkdir(File.join(local_dir, "rpm"))
-        _local_filename, contents = create_local_file_from_fixture("simple_text_file", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
-
-        deploy_package_repo default, local_dir, name, version
-
-        remote_contents = on(default, "cat /etc/yum.repos.d/#{name}.repo").stdout
-        assert_equal contents, remote_contents
-
-        # teardown
-        on default, "rm /etc/yum.repos.d/#{name}.repo"
-      end
-    end
-
-    step "#deploy_package_repo CURRENTLY fails with NoMethodError when passed a hosts array" do
-      # NOTE: would expect this to handle host arrays, or raise Beaker::Host::CommandFailure
-
-      Dir.mktmpdir do |local_dir|
-        name = "puppet-server"
-        version = "9.9.9"
-        platform = default['platform']
-
-        create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
-
-        assert_raises NoMethodError do
-          deploy_package_repo hosts, local_dir, name, version
-        end
-      end
-    end
-  end
-
-  confine_block :to, :platform => /ubuntu|debian|cumulus/i do
-
-    step "#deploy_package_repo pushes repo package to /etc/apt/sources.list.d on the remote host" do
-      Dir.mktmpdir do |local_dir|
-        name = "puppet-server"
-        version = "9.9.9"
-        codename = default['platform'].codename
-
-        FileUtils.mkdir(File.join(local_dir, "deb"))
-        _local_filename, contents = create_local_file_from_fixture("simple_text_file", File.join(local_dir, "deb"), "pl-#{name}-#{version}-#{codename}.list")
-
-        deploy_package_repo default, local_dir, name, version
-
-        remote_contents = on(default, "cat /etc/apt/sources.list.d/#{name}.list").stdout
-        assert_equal contents, remote_contents
-
-        # teardown
-        on default, "rm /etc/apt/sources.list.d/#{name}.list"
-      end
-    end
-
-    step "#deploy_package_repo CURRENTLY fails with NoMethodError when passed a hosts array" do
-      # NOTE: would expect this to handle host arrays, or raise Beaker::Host::CommandFailure
-
-      Dir.mktmpdir do |local_dir|
-        name = "puppet-server"
-        version = "9.9.9"
-        codename = default['platform'].codename
-
-        FileUtils.mkdir(File.join(local_dir, "deb"))
-        create_local_file_from_fixture("simple_text_file", File.join(local_dir, "deb"), "pl-#{name}-#{version}-#{codename}.list")
-
-        assert_raises NoMethodError do
-          deploy_package_repo hosts, local_dir, name, version
-        end
-      end
-    end
-  end
-
-  confine_block :to, :platform => /opensuse|sles/i do
-
-    step "#deploy_package_repo updates zypper repository list on the remote host" do
-      Dir.mktmpdir do |local_dir|
-        name = "puppet-server"
-        version = "9.9.9"
-        platform = default['platform']
-
-        FileUtils.mkdir(File.join(local_dir, "rpm"))
-        create_local_file_from_fixture("#{default["platform"]}.repo", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
-
-        deploy_package_repo default, local_dir, name, version
-
-        result = on default, "zypper repos -d"
-        assert_match "PE-2016.4-#{default['platform']}", result.stdout
-
-        # teardown
-        on default, "zypper rr #{default['platform']}"
-      end
-    end
-  end
-
-  confine_block :except, :platform => /el-\d|fedora|centos|eos|ubuntu|debian|cumulus|opensuse|sles/i do
-
-    # OS X, windows (cygwin, powershell), solaris, etc.
-
-    step "#deploy_package_repo CURRENTLY fails with a RuntimeError on on the #{default['platform']} platform" do
-      # NOTE: would expect this to raise Beaker::Host::CommandFailure instead of RuntimeError
-
-      Dir.mktmpdir do |local_dir|
-        name = "puppet-server"
-        version = "9.9.9"
-        platform = default['platform']
-
-        create_local_file_from_fixture("simple_text_file", local_dir, "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
-
-        assert_raises RuntimeError do
-          deploy_package_repo default, local_dir, name, version
-        end
-      end
-    end
-  end
-end

data/acceptance/tests/base/external_resources_test.rb

@@ -1,31 +0,0 @@
-test_name 'External Resources Test' do
-  step 'Verify EPEL resources are up and available' do
-    def build_url(el_version)
-      url_base = options[:epel_url]
-      "#{url_base}/epel-release-latest-#{el_version}.noarch.rpm"
-    end
-
-    def epel_url_test(el_version)
-      url = build_url(el_version)
-      # -I option just asks for headers, not looking to download the package
-      curl_cmd = Command.new("curl -I #{url}")
-      host = default
-      curl_headers_result = Result.new(host, curl_cmd)
-      curl_fail_msg = "EPEL curl failed, waiting for fibonacci backoff to retry..."
-
-      repeat_fibonacci_style_for(10) do
-        curl_headers_result = host.exec(curl_cmd)
-        curl_succeeded = curl_headers_result.exit_code == 0
-        logger.info(curl_fail_msg) unless curl_succeeded
-        curl_succeeded
-      end
-      assert_match(/200 OK/, curl_headers_result.stdout, "EPEL #{el_version} should be reachable at #{url}")
-    end
-
-    step 'Verify el_version numbers 6,7,8 are found on the epel resource' do
-      [6,7,8].each do |el_version|
-        epel_url_test(el_version)
-      end
-    end
-  end
-end

data/spec/beaker/host/mac_spec.rb

@@ -1,113 +0,0 @@
-require 'spec_helper'
-
-module Mac
-  describe Host do
-    let(:options)  { @options ? @options : {} }
-    let(:platform) {
-      if @platform
-        { :platform => Beaker::Platform.new( @platform) }
-      else
-        { :platform => Beaker::Platform.new( 'osx-10.12-x86_64' ) }
-      end
-    }
-    let(:host)    { make_host( 'name', options.merge(platform) ) }
-
-    describe '#puppet_agent_dev_package_info' do
-      it 'raises an error if puppet_collection isn\'t passed' do
-        expect { host.puppet_agent_dev_package_info(nil, 'maybe', :download_url => '') }.to raise_error(ArgumentError)
-      end
-
-      it 'raises an error if puppet_agent_version isn\'t passed' do
-        expect { host.puppet_agent_dev_package_info('maybe', nil, :download_url => '') }.to raise_error(ArgumentError)
-      end
-
-      it 'raises an error if opts[:download_url] isn\'t passed' do
-        expect { host.puppet_agent_dev_package_info('', '') }.to raise_error(ArgumentError)
-      end
-
-      it 'returns two strings that include the passed parameters' do
-        allow( host ).to receive( :link_exists? ).and_return(true)
-        return1, return2 = host.puppet_agent_dev_package_info( 'pc1', 'pav1', :download_url => '' )
-        expect( return1 ).to match( /pc1/ )
-        expect( return2 ).to match( /pav1/ )
-      end
-
-      it 'gets the correct file type' do
-        allow( host ).to receive( :link_exists? ).and_return(true)
-        _, return2 = host.puppet_agent_dev_package_info( 'pc2', 'pav2', :download_url => '' )
-        expect( return2 ).to match( /\.dmg$/ )
-      end
-
-      it 'adds the version dot correctly if not supplied' do
-        @platform = 'osx-10.12-x86_64'
-        allow( host ).to receive( :link_exists? ).and_return(true)
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC3', 'pav3', :download_url => '' )
-        expect( release_path_end ).to match( /10\.12/ )
-        expect( release_file ).to match( /10\.12/ )
-      end
-
-      it 'runs the correct install for osx platforms (newest link format)' do
-        allow( host ).to receive( :link_exists? ).and_return(true)
-
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC4', 'pav4', :download_url => '' )
-        # verify the mac package name starts the name correctly
-        expect( release_file ).to match( /^puppet-agent-pav4-/ )
-        # verify the "newest hotness" is set correctly for the end of the mac package name
-        expect( release_file ).to match( /#{Regexp.escape("-1.osx10.12.dmg")}$/ )
-        # verify the release path end is set correctly
-        expect( release_path_end ).to be === "apple/10.12/PC4/x86_64"
-      end
-
-      it 'runs the correct install for osx platforms (new link format)' do
-        allow( host ).to receive( :link_exists? ).and_return( false, true )
-
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC7', 'pav7', :download_url => '' )
-        # verify the mac package name starts the name correctly
-        expect( release_file ).to match( /^puppet-agent-pav7-/ )
-        # verify the "new hotness" is set correctly for the end of the mac package name
-        expect( release_file ).to match( /#{Regexp.escape("-1.sierra.dmg")}$/ )
-        # verify the release path end isn't changed in the "new hotness" case
-        expect( release_path_end ).to be === "apple/10.12/PC7/x86_64"
-      end
-
-      it 'runs the correct install for osx platforms (old link format)' do
-        allow( host ).to receive( :link_exists? ).and_return(false)
-
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC8', 'pav8', :download_url => '' )
-        # verify the mac package name starts the name correctly
-        expect( release_file ).to match( /^puppet-agent-pav8-/ )
-        # verify the old way is set correctly for the end of the mac package name
-        expect( release_file ).to match( /#{Regexp.escape("-osx-10.12-x86_64.dmg")}$/ )
-        # verify the release path end is set correctly to the older method
-        expect( release_path_end ).to be === "apple/PC8"
-      end
-    end
-
-    describe '#pe_puppet_agent_promoted_package_info' do
-      before do
-        @platform = "osx-10.15-x86_64"
-      end
-
-      it "uses the old scheme if the version is omitted" do
-        _, _, download_file = host.pe_puppet_agent_promoted_package_info('pa_collection')
-
-        expect(download_file).to eq('puppet-agent-osx-10.15.tar.gz')
-      end
-
-      {
-        '5.5.22' => 'puppet-agent-osx-10.15.tar.gz',
-        '6.27.0' => 'puppet-agent-osx-10.15.tar.gz',
-        '6.28.0' => 'puppet-agent-osx-10.15-x86_64.tar.gz',
-        '7.0.0'  => 'puppet-agent-osx-10.15.tar.gz',
-        '7.18.0' => 'puppet-agent-osx-10.15-x86_64.tar.gz',
-        '8.0.0'  => 'puppet-agent-osx-10.15-x86_64.tar.gz',
-      }.each_pair do |version, expected|
-        it "returns #{expected} for puppet-agent #{version}" do
-          _, _, download_file = host.pe_puppet_agent_promoted_package_info('pa_collection', puppet_agent_version: version)
-
-          expect(download_file).to eq(expected)
-        end
-      end
-    end
-  end
-end