Skip to content

Commit

Permalink
(#19558) Fix acceptance test failure
Browse files Browse the repository at this point in the history
Without this patch applied the commit in 38ef0c5 causes a behavior
change in the way error messages are formatted that fail to pass through
the regular expression used in our Solaris 10 acceptance test suite.

This patch addresses the problem by updating the regular expression to
match the error message produced by the current behavior of the system.
  • Loading branch information
Jeff McCune committed Mar 6, 2013
1 parent 6143203 commit 9801de5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion acceptance/tests/resource/zone/set_ip.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
step "Zone: ip - assign: ensure that our ip assignment works."
# --------------------------------------------------------------------
apply_manifest_on(agent,'zone {tstzone : ensure=>configured, iptype=>shared, path=>"/tstzones/mnt", ip=>"ip.if.1" }', :acceptable_exit_codes => [1] ) do
assert_match(/Error: ip must contain interface name and ip address separated by a ":"/, result.output, "err: #{agent}")
assert_match(/ip must contain interface name and ip address separated by a \W*?:/, result.output, "err: #{agent}")
end
apply_manifest_on(agent, 'zone {tstzone : ensure=>configured, iptype=>shared, path=>"/tstzones/mnt", ip=>"ip.if.1:1.1.1.1" }') do
assert_match(/defined 'ip' as .'ip.if.1:1.1.1.1'./ , result.stdout, "err: #{agent}")
Expand Down

0 comments on commit 9801de5

Please sign in to comment.