(maint) use condensed litmus spec_helper_acceptance; fixup tests

Author: DavidS

spec/acceptance/emit_json_options_spec.rb

@@ -49,7 +49,7 @@
     { :title => '--emit-json-stdout', :cmd_line => '--emit-json-stdout' }
   ].each do |testcase|
     it "should emit JSON to stdout when using #{testcase[:title]}" do
-      output = PuppetLitmus::PuppetHelpers.run_shell("puppet strings generate #{testcase[:cmd_line]} \"#{@test_module_path}/lib/puppet/parser/functions/function3x.rb\"").stdout.chomp
+      output = run_shell("puppet strings generate #{testcase[:cmd_line]} \"#{@test_module_path}/lib/puppet/parser/functions/function3x.rb\"").stdout.chomp
       expect(JSON.parse(output)).to eq(expected)
     end
   end
@@ -61,7 +61,7 @@
     it "should write JSON to a file when using #{testcase[:title]}" do
       tmpfile = File.join(@remote_tmp_path, 'json_output.json')
       cmd = "puppet strings generate #{testcase[:cmd_line].gsub('TMPFILE', tmpfile)} \"#{@test_module_path}/lib/puppet/parser/functions/function3x.rb\""
-      PuppetLitmus::PuppetHelpers.run_shell(cmd)
+      run_shell(cmd)
       output = JSON.parse(file(tmpfile).content)
       expect(output).to eq(expected)
     end

spec/spec_helper_acceptance.rb

@@ -1,58 +1,6 @@
-require 'serverspec'
-require 'puppet_litmus'
-include PuppetLitmus # rubocop:disable Style/MixinUsage This is fine
-
-if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost'
-  puts 'Running tests against this machine !'
-  if Gem.win_platform?
-    set :backend, :cmd
-  else
-    set :backend, :exec
-  end
-else
-  # load inventory
-  inventory_hash = inventory_hash_from_inventory_file
-  node_config = config_from_node(inventory_hash, ENV['TARGET_HOST'])
-
-  if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'docker_nodes')
-    host = ENV['TARGET_HOST']
-    set :backend, :docker
-    set :docker_container, host
-  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes')
-    set :backend, :ssh
-    options = Net::SSH::Config.for(host)
-    options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil?
-    options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil?
-    options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil?
-    options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil?
-    options[:verify_host_key] = Net::SSH::Verifiers::Never.new unless node_config.dig('ssh', 'host-key-check').nil?
-    host = if ENV['TARGET_HOST'].include?(':')
-             ENV['TARGET_HOST'].split(':').first
-           else
-             ENV['TARGET_HOST']
-           end
-    set :host,        options[:host_name] || host
-    set :ssh_options, options
-    set :request_pty, true
-  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'winrm_nodes')
-    require 'winrm'
-
-    set :backend, :winrm
-    set :os, family: 'windows'
-    user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil?
-    pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil?
-    endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
-
-    opts = {
-      user: user,
-      password: pass,
-      endpoint: endpoint,
-      operation_timeout: 300,
-    }
-
-    winrm = WinRM::Connection.new opts
-    Specinfra.configuration.winrm = winrm
-  end
-end
+# frozen_string_literal: true
 
+require 'puppet_litmus'
 require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))
+
+PuppetLitmus.configure!

spec/spec_helper_acceptance_local.rb

@@ -1,5 +1,6 @@
+
 def sut_module_path(module_regex)
-  modules = JSON.parse(PuppetLitmus::PuppetHelpers.run_shell('puppet module list --render-as json').stdout)
+  modules = JSON.parse(run_shell('puppet module list --render-as json').stdout)
   test_module_info = modules['modules_by_path'].values.flatten.find { |mod_info| mod_info =~ module_regex }
   test_module_info.match(/\(([^)]*)\)/)[1]
 end