Skip to content

Commit 6cb8f6d

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 e3ad954 commit 6cb8f6d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

spec/acceptance/tests/zfs/basic_tests_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
# ZFS: idempotence - create
3232
apply_manifest_on(agent, 'zfs {"tstpool/tstfs": ensure=>present}') do
33-
assert_no_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
33+
refute_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
3434
end
3535

3636
# ZFS: cleanup for next test

spec/acceptance/tests/zfs/should_be_idempotent_spec.rb

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

2525
# ZFS: idempotence - create
2626
apply_manifest_on(agent, 'zfs {"tstpool/tstfs": ensure=>present}') do
27-
assert_no_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
27+
refute_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
2828
end
2929

3030
# ZFS: change mount point and verify
@@ -34,7 +34,7 @@
3434

3535
# ZFS: change mount point and verify idempotence
3636
apply_manifest_on(agent, 'zfs {"tstpool/tstfs": ensure=>present, mountpoint=>"/ztstpool/mnt2"}') do
37-
assert_no_match(%r{changed}, @result.stdout, "err: #{agent}")
37+
refute_match(%r{changed}, @result.stdout, "err: #{agent}")
3838
end
3939
end
4040
end

spec/acceptance/tests/zpool/basic_tests_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
# ZPool: zpool should be idempotent
2626
apply_manifest_on(agent, "zpool{ tstpool: ensure=>present, disk=>'/ztstpool/dsk1' }") do
27-
assert_no_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
27+
refute_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
2828
end
2929

3030
# ZPool: remove zpool

spec/acceptance/tests/zpool/should_be_idempotent_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
# ZPool: idempotency - create
2626
apply_manifest_on(agent, "zpool{ tstpool: ensure=>present, disk=>'/ztstpool/dsk1' }") do
27-
assert_no_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
27+
refute_match(%r{ensure: created}, @result.stdout, "err: #{agent}")
2828
end
2929
end
3030
end

spec/acceptance/tests/zpool/should_remove_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
assert_match(%r{ensure: removed}, @result.stdout, "err: #{agent}")
2929
end
3030
on(agent, 'zpool list') do
31-
assert_no_match(%r{tstpool}, @result.stdout, "err: #{agent}")
31+
refute_match(%r{tstpool}, @result.stdout, "err: #{agent}")
3232
end
3333
end
3434
end

0 commit comments

Comments
 (0)