Skip to content

Commit 94fdb02

Browse files
committed
Replace assert_no_match
The assert_no_match method in Beaker was long deprecated then eventually removed altogether in voxpupuli/beaker@6282311 This commit updates assert_no_match to refute_match.
1 parent b183038 commit 94fdb02

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

spec/acceptance/pending/dataset.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def moreclean(agent)
5555
end
5656
step 'Zone: dataset - basic test, idempotency'
5757
apply_manifest_on(agent, 'zone {tstzone : ensure=>configured, dataset=>"tstpool/yy", path=>"/tstzones/mnt" }') do
58-
assert_no_match(%r{dataset changed tstpool/xx to \['tstpool/yy'\]}, result.stdout, "err: #{agent}")
58+
refute_match(%r{dataset changed tstpool/xx to \['tstpool/yy'\]}, result.stdout, "err: #{agent}")
5959
end
6060
step 'Zone: dataset - array test, should change to an array'
6161
apply_manifest_on(agent, 'zone {tstzone : ensure=>configured, dataset=>["tstpool/yy","tstpool/zz"], path=>"/tstzones/mnt" }') do

spec/acceptance/tests/zone_configured_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def config_inherit_string(agent)
2727

2828
step 'Zone: steps - verify (create)'
2929
on(agent, 'zoneadm -z tstzone verify') do |result|
30-
assert_no_match(%r{could not verify}, result.stdout, "err: #{agent}")
30+
refute_match(%r{could not verify}, result.stdout, "err: #{agent}")
3131
end
3232

3333
step 'Zone: steps - configured -> installed'

spec/acceptance/tests/zone_ensure_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
# should be idempotent
4545
apply_manifest_on(agent, running_manifest) do |result|
46-
assert_no_match(%r{created|changed|removed}, result.stdout, "err: #{agent}")
46+
refute_match(%r{created|changed|removed}, result.stdout, "err: #{agent}")
4747
end
4848

4949
step 'Zone: ensure can remove'
@@ -52,7 +52,7 @@
5252
assert_match(%r{ensure: removed}, result.stdout, "err: #{agent}")
5353
end
5454
on(agent, 'zoneadm list -cp') do |result|
55-
assert_no_match(%r{tstzone}, result.stdout, "err: #{agent}")
55+
refute_match(%r{tstzone}, result.stdout, "err: #{agent}")
5656
end
5757
end
5858
end

spec/acceptance/tests/zone_ip_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
ip => ["ip.if.1:1.1.1.1", "ip.if.2:1.1.1.3"]
9595
}
9696
MANIFEST
97-
assert_no_match(%r{ip changed}, result.stdout, "err: #{agent}")
97+
refute_match(%r{ip changed}, result.stdout, "err: #{agent}")
9898
end
9999
end
100100
end

spec/acceptance/tests/zone_running_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def config_inherit_string(agent)
3636

3737
step 'Zone: statemachine - ensure zone is correct'
3838
on(agent, 'zoneadm -z tstzone verify') do |result|
39-
assert_no_match(%r{could not verify}, result.stdout, "err: #{agent}")
39+
refute_match(%r{could not verify}, result.stdout, "err: #{agent}")
4040
end
4141

4242
step 'Zone: statemachine - ensure zone is running'

0 commit comments

Comments
 (0)