beaker 4.38.1 → 4.39.0

data/spec/beaker/options/data/hosts_preserved.yml

@@ -0,0 +1,395 @@
+--- !ruby/hash:Beaker::Options::OptionsHash
+:project: Beaker
+:department: unknown
+:created_by: rspec
+:host_tags: !ruby/hash:Beaker::Options::OptionsHash {}
+:openstack_api_key: 
+:openstack_username: 
+:openstack_auth_url: "/tokens"
+:openstack_tenant: 
+:openstack_keyname: 
+:openstack_network: 
+:openstack_region: 
+:openstack_volume_support: true
+:jenkins_build_url: 
+:validate: true
+:configure: true
+:log_level: debug
+:trace_limit: 10
+:master-start-curl-retries: 120
+:masterless: false
+:options_file: 
+:type: pe
+:provision: true
+:preserve_hosts: always
+:root_keys: false
+:quiet: false
+:project_root: "/path/to/project"
+:xml_dir: junit
+:xml_file: beaker_junit.xml
+:xml_time: beaker_times.xml
+:xml_time_enabled: false
+:xml_stylesheet: junit.xsl
+:default_log_prefix: beaker_logs
+:log_dir: log
+:log_sut_event: sut.log
+:color: true
+:dry_run: false
+:test_tag_and: &3 []
+:test_tag_or: &4 []
+:test_tag_exclude: &5 []
+:timeout: 900
+:fail_mode: slow
+:test_results_file: ''
+:accept_all_exit_codes: false
+:timesync: false
+:disable_iptables: false
+:set_env: true
+:disable_updates: true
+:repo_proxy: false
+:package_proxy: false
+:add_el_extras: false
+:epel_url: http://dl.fedoraproject.org/pub/epel
+:consoleport: 443
+:pe_dir: "/opt/enterprise/dists"
+:pe_version_file: LATEST
+:pe_version_file_win: LATEST-win
+:host_env: !ruby/hash:Beaker::Options::OptionsHash {}
+:host_name_prefix: 
+:ssh_env_file: "~/.ssh/environment"
+:profile_d_env_file: "/etc/profile.d/beaker_env.sh"
+:dot_fog: "/home/user/.fog"
+:ec2_yaml: config/image_templates/ec2.yaml
+:help: false
+:collect_perf_data: none
+:puppetdb_port_ssl: 8081
+:puppetdb_port_nonssl: 8080
+:puppetserver_port: 8140
+:nodeclassifier_port: 4433
+:cache_files_locally: false
+:aws_keyname_modifier: '1234567890'
+:run_in_parallel: &6 []
+:use_fog_credentials: true
+:ssh: !ruby/hash:Beaker::Options::OptionsHash
+  :config: true
+  :verify_host_key: false
+  :auth_methods: &7
+  - publickey
+  :port: 22
+  :forward_agent: 'true'
+  :keys: &8
+  - "/home/user/.ssh/id_rsa"
+  :user_known_hosts_file: "/home/user/.ssh/known_hosts"
+  :keepalive: true
+  :logger: &9 !ruby/object:Logger
+    level: 4
+    progname: 
+    default_formatter: !ruby/object:Logger::Formatter
+      datetime_format: 
+    formatter: 
+    logdev: !ruby/object:Logger::LogDevice
+      shift_period_suffix: 
+      shift_size: 
+      shift_age: 
+      filename: 
+      dev: !ruby/object:IO {}
+      binmode: false
+      mon_data: !ruby/object:Monitor {}
+      mon_data_owner_object_id: 4980
+  :password_prompt: &10 !ruby/object:Net::SSH::Prompt {}
+  :user: root
+:helper: &11
+- lib/beaker_helper.rb
+:keyfile: "/home/user/.ssh/id_rsa"
+:hosts_file: "/path/to/hosts.cfg"
+:pre_suite: &12 []
+:command_line: "/path/to/beaker
+  --helper lib/beaker_helper.rb --debug --keyfile /home/user/.ssh/id_rsa
+  --hosts=hosts.cfg --pre-suite=setup/install.rb"
+:HOSTS:
+  primary.host: !ruby/hash:Beaker::Options::OptionsHash
+    :pe_dir: https://where.we.keep.pe
+    :pe_ver: 2021.5.0
+    :pe_upgrade_dir: https://where.we.keep.pe/upgrade
+    :pe_upgrade_ver: 2021.7.0
+    :platform: &1 !ruby/string:Beaker::Platform
+      str: el-7-x86_64
+      variant: !ruby/string:Beaker::Platform el
+      arch: !ruby/string:Beaker::Platform x86_64
+      version: !ruby/string:Beaker::Platform '7'
+      codename: 
+    :template: redhat-7-x86_64
+    :hypervisor: vmpooler
+    :roles:
+    - agent
+    - master
+    - dashboard
+    - database
+    - default
+    :host_tags: !ruby/hash:Beaker::Options::OptionsHash {}
+    :user: root
+    :group: puppet
+    :pathseparator: ":"
+    :packaging_platform: *1
+    :ssh_connection_preference:
+    - :ip
+    - :vmhostname
+    - :hostname
+    :vmhostname: primary.host
+    :ip: 
+    :puppetserver-confdir: "/etc/puppetlabs/puppetserver/conf.d"
+    :puppetservice: pe-puppetserver
+    :puppetpath: "/etc/puppetlabs/puppet"
+    :puppetconfdir: "/etc/puppetlabs/puppet"
+    :puppetbin: "/opt/puppet/bin/puppet"
+    :puppetbindir: "/opt/puppetlabs/bin"
+    :puppetsbindir: "/opt/puppet/sbin"
+    :privatebindir: "/opt/puppetlabs/puppet/bin"
+    :puppetvardir: "/var/opt/lib/pe-puppet"
+    :hieradatadir: "/var/lib/hiera"
+    :hieraconf: "/etc/puppetlabs/puppet/hiera.yaml"
+    :distmoduledir: "/etc/puppetlabs/code/modules"
+    :sitemoduledir: "/opt/puppetlabs/puppet/modules"
+    :type: pe
+    :pe_installer: puppet-enterprise-installer
+    :dist: puppet-enterprise-2021.5.0-el-7-x86_64
+    :working_dir: "/tmp/workingdir"
+    :pe_installer_conf_file: "/tmp/workingdir/pe.conf"
+    :pe_installer_conf_setting: "-c /tmp/workingdir/pe.conf"
+    :answers: !ruby/hash:Beaker::Options::OptionsHash
+      :q_install: y
+      :q_vendor_packages_install: y
+      :q_puppetagent_install: y
+      :q_verify_packages: y
+      :q_puppet_symlinks_install: y
+      :q_puppetagent_certname: primary.host
+      :q_puppetmaster_install: y
+      :q_all_in_one_install: y
+      :q_puppet_enterpriseconsole_install: y
+      :q_puppetdb_install: y
+      :q_database_install: y
+      :q_puppetagent_server: primary.host
+      :q_puppetdb_hostname: primary.host
+      :q_puppetdb_port: 8081
+      :q_puppetmaster_dnsaltnames: primary.host,puppet
+      :q_puppetmaster_enterpriseconsole_hostname: primary.host
+      :q_puppetmaster_enterpriseconsole_port: 443
+      :q_puppetmaster_certname: primary.host
+      :q_puppetdb_database_name: pe-puppetdb
+      :q_puppetdb_database_user: pdb_user
+      :q_puppetdb_database_password: "''"
+      :q_puppet_enterpriseconsole_auth_database_name: console_auth
+      :q_puppet_enterpriseconsole_auth_database_user: console_auth_user
+      :q_puppet_enterpriseconsole_auth_database_password: "''"
+      :q_puppet_enterpriseconsole_database_name: console
+      :q_puppet_enterpriseconsole_database_user: console_database_user
+      :q_puppet_enterpriseconsole_database_password: "''"
+      :q_database_host: primary.host
+      :q_database_port: 
+      :q_pe_database: y
+      :q_puppet_enterpriseconsole_inventory_hostname: primary.host
+      :q_puppet_enterpriseconsole_inventory_certname: primary.host
+      :q_puppet_enterpriseconsole_inventory_dnsaltnames: primary.host
+      :q_puppet_enterpriseconsole_inventory_port: 8140
+      :q_puppet_enterpriseconsole_master_hostname: primary.host
+      :q_puppet_enterpriseconsole_auth_user_email: "''"
+      :q_puppet_enterpriseconsole_auth_password: "''"
+      :q_puppet_enterpriseconsole_httpd_port: 443
+      :q_puppet_enterpriseconsole_smtp_host: "'primary.host'"
+      :q_puppet_enterpriseconsole_smtp_use_tls: "''"
+      :q_puppet_enterpriseconsole_smtp_port: "''"
+      :q_database_root_password: "'supersecurepassword'"
+      :q_database_root_user: pe-postgres
+      :q_pe_check_for_updates: n
+      :q_classifier_database_user: classifier_user
+      :q_classifier_database_name: pe-classifier
+      :q_classifier_database_password: "''"
+      :q_activity_database_user: activity_user
+      :q_activity_database_name: pe-activity
+      :q_activity_database_password: "''"
+      :q_rbac_database_user: rbac_user
+      :q_rbac_database_name: pe-rbac
+      :q_rbac_database_password: "''"
+      :q_exit_for_nc_migrate: n
+      :q_enable_future_parser: n
+      :q_update_server_host: primary.host
+      :q_install_update_server: y
+      :q_orchestrator_database_name: 
+      :q_orchestrator_database_user: 
+      :q_orchestrator_database_password: "''"
+      :q_use_application_services: y
+:nfs_server: none
+:forge_host: forge.puppet.com
+:pooling_api: https://pooler.host
+:home: "/home/user"
+:load_path: &13 []
+:tests: &14 []
+:post_suite: &15 []
+:install: &16 []
+:pre_cleanup: &17 []
+:modules: &18 []
+:logger: !ruby/object:Beaker::Logger
+  color: true
+  sublog: &2 !ruby/object:StringIO {}
+  log_level: :debug
+  last_result: !ruby/object:Beaker::Result
+    host: redhat7-64-1
+    cmd: puppet agent -t
+    stdout: "Things happened here"
+    stderr: ''
+    output: "Things happened here"
+    exit_code: 2
+    raw_stdout: "Things happened here"
+    raw_stderr: ''
+    raw_output: "Things happened here"
+  line_prefix: ''
+  destinations:
+  - !ruby/object:IO {}
+  - *2
+  log_colors:
+    :error: "\e[00;31m"
+    :warn: "\e[01;31m"
+    :success: "\e[00;35m"
+    :notify: "\e[00;34m"
+    :info: "\e[00;32m"
+    :debug: "\e[00;37m"
+    :trace: "\e[01;33m"
+    :perf: "\e[01;35m"
+    :host: "\e[00;33m"
+:timestamp: 2022-07-28 21:06:27.978864297 +00:00
+:beaker_version: 4.37.1
+:log_prefix: hosts.cfg
+:xml_dated_dir: junit/hosts.cfg/2022-07-28_21_06_27
+:log_dated_dir: log/hosts.cfg/2022-07-28_21_06_27
+:logger_sut: !ruby/object:Beaker::Logger
+  color: 
+  sublog: 
+  log_level: :verbose
+  last_result: 
+  line_prefix: ''
+  destinations:
+  - !ruby/object:File {}
+  log_colors:
+    :error: "\e[00;31m"
+    :warn: "\e[01;31m"
+    :success: "\e[00;35m"
+    :notify: "\e[00;34m"
+    :info: "\e[00;32m"
+    :debug: "\e[00;37m"
+    :trace: "\e[01;33m"
+    :perf: "\e[01;35m"
+    :host: "\e[00;33m"
+:net_diag_hosts: &19
+- https://host1
+- https://host2
+- http://host3
+- https://host4
+:answers:
+  puppet_enterprise::master::recover_configuration::recover_configuration_interval: 0
+  :feature_flags: !ruby/hash:StringifyHash {}
+:CONFIG: !ruby/hash:Beaker::Options::OptionsHash
+  :project: Beaker
+  :department: unknown
+  :created_by: user
+  :host_tags: !ruby/hash:Beaker::Options::OptionsHash {}
+  :openstack_api_key: 
+  :openstack_username: 
+  :openstack_auth_url: "/tokens"
+  :openstack_tenant: 
+  :openstack_keyname: 
+  :openstack_network: 
+  :openstack_region: 
+  :openstack_volume_support: true
+  :jenkins_build_url: 
+  :validate: true
+  :configure: true
+  :log_level: debug
+  :trace_limit: 10
+  :master-start-curl-retries: 120
+  :masterless: false
+  :options_file: 
+  :type: pe
+  :provision: false
+  :preserve_hosts: always
+  :root_keys: false
+  :quiet: false
+  :project_root: "/path/to/project"
+  :xml_dir: junit
+  :xml_file: beaker_junit.xml
+  :xml_time: beaker_times.xml
+  :xml_time_enabled: false
+  :xml_stylesheet: junit.xsl
+  :log_dir: log
+  :log_sut_event: sut.log
+  :color: true
+  :dry_run: false
+  :test_tag_and: *3
+  :test_tag_or: *4
+  :test_tag_exclude: *5
+  :timeout: 900
+  :fail_mode: slow
+  :test_results_file: ''
+  :accept_all_exit_codes: false
+  :timesync: false
+  :disable_iptables: false
+  :set_env: true
+  :disable_updates: true
+  :repo_proxy: false
+  :package_proxy: false
+  :add_el_extras: false
+  :epel_url: http://dl.fedoraproject.org/pub/epel
+  :consoleport: 443
+  :pe_dir: "/opt/enterprise/dists"
+  :pe_version_file: LATEST
+  :pe_version_file_win: LATEST-win
+  :host_env: !ruby/hash:Beaker::Options::OptionsHash {}
+  :host_name_prefix: 
+  :ssh_env_file: "~/.ssh/environment"
+  :profile_d_env_file: "/etc/profile.d/beaker_env.sh"
+  :dot_fog: "/home/user/.fog"
+  :ec2_yaml: config/image_templates/ec2.yaml
+  :help: false
+  :collect_perf_data: none
+  :puppetdb_port_ssl: 8081
+  :puppetdb_port_nonssl: 8080
+  :puppetserver_port: 8140
+  :nodeclassifier_port: 4433
+  :cache_files_locally: false
+  :aws_keyname_modifier: '1234567890'
+  :run_in_parallel: *6
+  :use_fog_credentials: true
+  :ssh: !ruby/hash:Beaker::Options::OptionsHash
+    :config: true
+    :verify_host_key: false
+    :auth_methods: *7
+    :port: 22
+    :forward_agent: 'true'
+    :keys: *8
+    :user_known_hosts_file: "/home/user/.ssh/known_hosts"
+    :keepalive: true
+    :logger: *9
+    :password_prompt: *10
+    :user: root
+  :helper: *11
+  :keyfile: "/home/user/.ssh/id_rsa"
+  :hosts_file: "/path/to/hosts.cfg"
+  :pre_suite: *12
+  :command_line: "/path/to/beaker
+    --helper lib/beaker_helper.rb --debug --keyfile /home/user/.ssh/id_rsa
+    --hosts=hosts.cfg --pre-suite=setup/install.rb"
+  :nfs_server: none
+  :forge_host: forge.puppet.com
+  :pooling_api: https://pooler.host
+  :home: "/home/user"
+  :load_path: *13
+  :tests: *14
+  :post_suite: *15
+  :install: *16
+  :pre_cleanup: *17
+  :modules: *18
+  :beaker_version: 4.37.1
+  :net_diag_hosts: *19
+  :answers: !ruby/hash:Beaker::Options::OptionsHash
+    :puppet_enterprise::master::recover_configuration::recover_configuration_interval: 0
+    :feature_flags: !ruby/hash:Beaker::Options::OptionsHash {}
+  :CONFIG: !ruby/hash:Beaker::Options::OptionsHash {}

data/spec/beaker/options/hosts_file_parser_spec.rb

@@ -4,8 +4,9 @@ module Beaker
   module Options
     describe HostsFileParser do
 
-      let(:parser)      {HostsFileParser}
+      let(:parser)      {described_class}
       let(:filepath)    {File.join(File.expand_path(File.dirname(__FILE__)), "data", "hosts.cfg")}
+      let(:filepath_yaml) {File.join(File.expand_path(File.dirname(__FILE__)), "data", "hosts_preserved.yml")}
 
       describe '#parse_hosts_file' do
         it "can correctly read a host file" do
@@ -57,6 +58,12 @@ module Beaker
           beaker_options_hash = parser.parse_hosts_file( yaml_string )
           expect(beaker_options_hash['1 plus 2']).to eq(3)
         end
+
+        it "can correctly read a hosts_preserved.yml file" do
+          FakeFS.deactivate!
+          expect{ parser.parse_hosts_file(filepath_yaml) }.not_to raise_error
+          expect(parser.parse_hosts_file(filepath_yaml).dig(:HOSTS, :"primary.host")).not_to be_nil
+        end
       end
 
       describe '#parse_hosts_string' do
@@ -114,7 +121,7 @@ module Beaker
 
           parser.fix_roles_array( host_options )
 
-          host_options['HOSTS'].each do |host_name, host_hash|
+          host_options['HOSTS'].each do |_host_name, host_hash|
             expect( host_hash['roles'] ).to be === []
           end
         end

data/spec/beaker/options/options_file_parser_spec.rb

@@ -4,7 +4,7 @@ module Beaker
   module Options
     describe OptionsFileParser do
 
-      let(:parser) {Beaker::Options::OptionsFileParser}
+      let(:parser) {described_class}
       let(:simple_opts) {File.join(File.expand_path(File.dirname(__FILE__)), "data", "opts.txt")}
 
       it "can correctly read options from a file" do

data/spec/beaker/options/options_hash_spec.rb

@@ -3,20 +3,20 @@ require "spec_helper"
 module Beaker
   module Options
     describe OptionsHash do
-      let(:options)    { Beaker::Options::OptionsHash.new }
+      let(:options)    { described_class.new }
 
 
       it "supports is_pe?, defaults to pe" do
-        expect(options.is_pe?).to be_truthy
+        expect(options).to be_is_pe
       end
 
       it "supports is_pe?, respects :type == foss" do
         options[:type] = 'foss'
-        expect(options.is_pe?).to be_falsy
+        expect(options).not_to be_is_pe
       end
 
       describe '#get_type' do
-        let(:options) { Beaker::Options::OptionsHash.new }
+        let(:options) { described_class.new }
 
         it 'returns pe as expected in the normal case' do
           newhash = options.merge({:type => 'pe'})

data/spec/beaker/options/parser_spec.rb

@@ -4,12 +4,12 @@ module Beaker
   module Options
 
     describe Parser do
-      let(:parser) { Parser.new }
+      let(:parser) { described_class.new }
       let(:opts_path) { File.join(File.expand_path(File.dirname(__FILE__)), "data", "opts.txt") }
       let(:hosts_path) { File.join(File.expand_path(File.dirname(__FILE__)), "data", "hosts.cfg") }
 
       it "supports usage function" do
-        expect { parser.usage }.to_not raise_error
+        expect { parser.usage }.not_to raise_error
       end
 
       describe 'parse_git_repos' do
@@ -78,7 +78,7 @@ module Beaker
         let(:test_dir) { 'tmp/tests' }
         let(:other_test_dir) { 'tmp/tests2' }
 
-        before :each do
+        before do
           files = [
               '00_EnvSetup.rb', '035_StopFirewall.rb', '05_HieraSetup.rb',
               '01_TestSetup.rb', '03_PuppetMasterSanity.rb',
@@ -172,7 +172,7 @@ module Beaker
               }
           }}
 
-          before :each do
+          before do
             expect(parser).to receive(:normalize_args).and_return(true)
           end
 
@@ -340,8 +340,8 @@ module Beaker
       describe '#parse_hosts_options' do
 
         context 'Hosts file exists' do
-          before :each do
-            allow(File).to receive(:exists?).and_return(true)
+          before do
+            allow(File).to receive(:exist?).and_return(true)
           end
 
           it 'returns the parser\'s output' do
@@ -357,8 +357,8 @@ module Beaker
 
         context 'Hosts file does not exist' do
           require 'beaker-hostgenerator'
-          before :each do
-            allow(File).to receive(:exists?).and_return(false)
+          before do
+            allow(File).to receive(:exist?).and_return(false)
           end
 
           it 'calls beaker-hostgenerator to get hosts information' do
@@ -546,7 +546,7 @@ module Beaker
           filename
         end
 
-        shared_examples_for(:a_platform_supporting_only_agents) do |platform, _type|
+        shared_examples_for('a platform supporting only agents') do |platform, _type|
 
           it "restricts #{platform} hosts to agent" do
             args = []
@@ -556,8 +556,8 @@ module Beaker
         end
 
         context "restricts agents" do
-          it_should_behave_like(:a_platform_supporting_only_agents, 'windows-version-arch')
-          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4-arch')
+          it_behaves_like('a platform supporting only agents', 'windows-version-arch')
+          it_behaves_like('a platform supporting only agents', 'el-4-arch')
         end
 
         context "ssh user" do
@@ -586,10 +586,10 @@ module Beaker
       end
 
       describe '#normalize_tags!' do
-        let (:test_tag_and      ) { @test_tag_and     || [] }
-        let (:test_tag_or       ) { @test_tag_or      || [] }
-        let (:test_tag_exclude  ) { @test_tag_exclude || [] }
-        let (:options           ) {
+        let(:test_tag_and      ) { @test_tag_and     || [] }
+        let(:test_tag_or       ) { @test_tag_or      || [] }
+        let(:test_tag_exclude  ) { @test_tag_exclude || [] }
+        let(:options           ) {
           opts                    = Beaker::Options::OptionsHash.new
           opts[:test_tag_and]     = test_tag_and
           opts[:test_tag_or]      = test_tag_or
@@ -644,7 +644,7 @@ module Beaker
       end
 
       describe '#resolve_symlinks' do
-        let (:options) { Beaker::Options::OptionsHash.new }
+        let(:options) { Beaker::Options::OptionsHash.new }
 
         it 'calls File.realpath if hosts_file is set' do
           options[:hosts_file] = opts_path
@@ -658,7 +658,7 @@ module Beaker
           options[:hosts_file] = nil
           parser.instance_variable_set(:@options, options)
 
-          expect { parser.resolve_symlinks! }.to_not raise_error
+          expect { parser.resolve_symlinks! }.not_to raise_error
         end
       end
 
@@ -691,10 +691,10 @@ module Beaker
       end
 
       describe '#check_hypervisor_config' do
-        let (:options) { Beaker::Options::OptionsHash.new }
-        let (:invalid_file) { '/tmp/doesnotexist_visor.yml' }
+        let(:options) { Beaker::Options::OptionsHash.new }
+        let(:invalid_file) { '/tmp/doesnotexist_visor.yml' }
 
-        before :each do
+        before do
           FakeFS.deactivate!
         end
 
@@ -703,7 +703,7 @@ module Beaker
           options[:dot_fog]  = invalid_file
           parser.instance_variable_set(:@options, options)
 
-          expect { parser.check_hypervisor_config('blimpy') }.to_not raise_error
+          expect { parser.check_hypervisor_config('blimpy') }.not_to raise_error
         end
 
         it 'throws an error if ec2_yaml for blimpy is invalid' do
@@ -720,7 +720,7 @@ module Beaker
             options[:dot_fog]  = hosts_path
             parser.instance_variable_set(:@options, options)
 
-            expect { parser.check_hypervisor_config(visor) }.to_not raise_error
+            expect { parser.check_hypervisor_config(visor) }.not_to raise_error
           end
 
           it "throws an error if dot_fog for #{visor} is invalid" do
@@ -733,7 +733,7 @@ module Beaker
         end
 
         it 'does not throw error on unknown visor' do
-          expect { parser.check_hypervisor_config('unknown_visor') }.to_not raise_error
+          expect { parser.check_hypervisor_config('unknown_visor') }.not_to raise_error
         end
       end
     end

data/spec/beaker/options/presets_spec.rb

@@ -4,7 +4,7 @@ module Beaker
   module Options
 
     describe Presets do
-      let(:presets)    { Presets.new }
+      let(:presets)    { described_class.new }
 
       it "returns an env_vars OptionsHash" do
         expect(presets.env_vars).to be_instance_of(Beaker::Options::OptionsHash)
@@ -34,7 +34,7 @@ module Beaker
       end
 
       it 'has empty host_tags' do
-        expect(presets.presets.has_key?(:host_tags)).to be_truthy
+        expect(presets.presets).to have_key(:host_tags)
         expect(presets.presets[:host_tags]).to eq({})
       end
 

data/spec/beaker/options/subcommand_options_parser_spec.rb

@@ -17,6 +17,7 @@ module Beaker
 
       describe 'when the subcommand is init' do
         let( :argv ) {['init']}
+
         it 'returns an empty OptionsHash' do
           expect(parser).to be_kind_of(OptionsHash)
           expect(parser).to be_empty
@@ -25,13 +26,13 @@ module Beaker
 
       describe 'when the subcommand is not init' do
         let( :argv ) {['provision']}
-        let(:options_file) {Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS}
+        let( :options_file ) {home_options_file_path}
+
         it 'calls parse_options_file with subcommand options file when home_dir is false' do
           allow(parser_mod).to receive(:execute_subcommand?).with('provision').and_return true
           allow(parser_mod).to receive(:parse_options_file).with(Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS)
         end
 
-        let( :options_file ) {home_options_file_path}
         it 'calls parse_options_file with home directory options file when home_dir is true' do
           allow(parser_mod).to receive(:execute_subcommand?).with('provision').and_return true
           allow(parser_mod).to receive(:parse_options_file).with(home_options_file_path)
@@ -44,7 +45,7 @@ module Beaker
           expect(file_parser).not_to be_kind_of(OptionsHash)
         end
 
-        let(:options_file) {""}
+
         it 'returns an empty options hash when file does not exist' do
           allow(File).to receive(:exist?).and_return false
           expect(parser).to be_kind_of(OptionsHash)