diff --git a/acceptance/tests/resource/package/ips/basic_tests.rb b/acceptance/tests/resource/package/ips/basic_tests.rb index f08a4eb21..a41508837 100644 --- a/acceptance/tests/resource/package/ips/basic_tests.rb +++ b/acceptance/tests/resource/package/ips/basic_tests.rb @@ -1,73 +1,73 @@ test_name "Package:IPS basic tests" confine :to, :platform => 'solaris-11' require 'puppet/acceptance/solaris_util' extend Puppet::Acceptance::IPSUtils teardown do step "cleanup" agents.each do |agent| clean agent end end agents.each do |agent| step "IPS: clean slate" clean agent step "IPS: setup" setup agent setup_fakeroot agent send_pkg agent, :pkg => 'mypkg@0.0.1' set_publisher agent step "IPS: basic ensure we are clean" apply_manifest_on(agent, 'package {mypkg : ensure=>absent}') on(agent, "pkg list -v mypkg", :acceptable_exit_codes => [1]) do assert_no_match( /mypkg@0.0.1/, result.stdout, "err: #{agent}") end step "IPS: basic - it should create" apply_manifest_on(agent, 'package {mypkg : ensure=>present}') do assert_match( /ensure: created/, result.stdout, "err: #{agent}") end step "IPS: check it was created" on agent, "puppet resource package mypkg" do - assert_match( /ensure => '0.0.1'/, result.stdout, "err: #{agent}") + assert_match( /ensure => '0\.0\.1,.*'/, result.stdout, "err: #{agent}") end step "IPS: do not upgrade until latest is mentioned" send_pkg agent,:pkg => 'mypkg@0.0.2' apply_manifest_on(agent, 'package {mypkg : ensure=>present}') do assert_no_match( /ensure: created/, result.stdout, "err: #{agent}") end step "IPS: verify it was not upgraded" on agent, "puppet resource package mypkg" do - assert_match( /ensure => '0.0.1'/, result.stdout, "err: #{agent}") + assert_match( /ensure => '0\.0\.1,.*'/, result.stdout, "err: #{agent}") end step "IPS: ask to be latest" apply_manifest_on(agent, 'package {mypkg : ensure=>latest}') step "IPS: ensure it was upgraded" on agent, "puppet resource package mypkg" do - assert_match( /ensure => '0.0.2'/, result.stdout, "err: #{agent}") + assert_match( /ensure => '0\.0\.2,.*'/, result.stdout, "err: #{agent}") end step "IPS: when there are more than one option, choose latest." send_pkg agent,:pkg => 'mypkg@0.0.3' send_pkg agent,:pkg => 'mypkg@0.0.4' apply_manifest_on(agent, 'package {mypkg : ensure=>latest}') on agent, "puppet resource package mypkg" do - assert_match( /ensure => '0.0.4'/, result.stdout, "err: #{agent}") + assert_match( /ensure => '0\.0\.4,.*'/, result.stdout, "err: #{agent}") end step "IPS: ensure removed." apply_manifest_on(agent, 'package {mypkg : ensure=>absent}') on(agent, "pkg list -v mypkg", :acceptable_exit_codes => [1]) do assert_no_match( /mypkg@0.0.1/, result.stdout, "err: #{agent}") end end diff --git a/acceptance/tests/resource/package/ips/should_create.rb b/acceptance/tests/resource/package/ips/should_create.rb index 3d0eb66d1..88242d6e8 100644 --- a/acceptance/tests/resource/package/ips/should_create.rb +++ b/acceptance/tests/resource/package/ips/should_create.rb @@ -1,34 +1,34 @@ test_name "Package:IPS basic tests" confine :to, :platform => 'solaris-11' require 'puppet/acceptance/solaris_util' extend Puppet::Acceptance::IPSUtils teardown do step "cleanup" agents.each do |agent| clean agent end end agents.each do |agent| step "IPS: clean slate" clean agent step "IPS: setup" setup agent setup_fakeroot agent send_pkg agent, :pkg => 'mypkg@0.0.1' set_publisher agent step "IPS: basic - it should create" apply_manifest_on(agent, 'package {mypkg : ensure=>present}') do assert_match( /ensure: created/, result.stdout, "err: #{agent}") end step "IPS: check it was created" on agent, "puppet resource package mypkg" do - assert_match( /ensure => '0.0.1'/, result.stdout, "err: #{agent}") + assert_match( /ensure => '0\.0\.1,.*'/, result.stdout, "err: #{agent}") end on agent, "pkg list -v mypkg" do assert_match( /mypkg@0.0.1/, result.stdout, "err: #{agent}") end end