Merge pull request #9258 from tvpartytonight/PUP-11942_beaker5

Update testing to use beaker 5

acceptance/Gemfile

@@ -12,10 +12,10 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
-gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || ["~>1.0", ">= 1.18.4"])
+gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5.0')
+gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION' || "~> 3.0"])
 gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 2")
-gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || "~> 0.4")
+gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || "~> 1.0")
 gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || "~> 0")
 gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || "~> 1.3")
 gem "beaker-vcloud", *location_for(ENV['BEAKER_VCLOUD_VERSION'] || "~> 1.0")

acceptance/tests/ticket_2455_on_solaris_init_provider_should_start_service_in_own_smf_contract.rb

@@ -116,7 +116,7 @@
     step "Start the fixture service on #{agent} "
     on(agent, puppet("resource service #{fixture_service} provider=init ensure=stopped"))
     on(agent, puppet("resource service #{fixture_service} provider=init ensure=running")) do |result|
-      assert_match(/ensure changed 'stopped' to 'running'/, stdout, "The fixture service #{fixture_service} is not in a testable state on #{agent}.")
+      assert_match(/ensure changed 'stopped' to 'running'/, result.stdout, "The fixture service #{fixture_service} is not in a testable state on #{agent}.")
     end
 
     step "Verify whether the fixture process is alone in its SMF contract on #{agent}"