Skip to content

Commit b578196

Browse files
authored
Merge pull request #2558 from mhashizume/maint/main/refute_match
(maint) Update assert_not_match to refute_match
2 parents 91584c3 + 4584b15 commit b578196

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/unit_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- '2.5'
2222
- '2.7'
2323
- '3.0'
24-
- '3.2.0'
24+
- '3.2'
2525
- 'jruby-9.3.7.0'
2626
runs-on: ubuntu-20.04
2727
steps:
@@ -42,7 +42,7 @@ jobs:
4242
matrix:
4343
ruby:
4444
- '2.7'
45-
- '3.2.0'
45+
- '3.2'
4646
runs-on: windows-2019
4747
steps:
4848
- name: Checkout current PR

acceptance/tests/external_facts/handle_same_filename_in_different_dirs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
on(agent, facter("--external-dir \"#{external_dir1}\" --external-dir \"#{external_dir2}\" --debug #{fact1} #{fact2}"), :acceptable_exit_codes => 1) do |facter_output|
5353
assert_match(/ERROR.*Caching is enabled for group "#{external_filename}" while there are at least two external facts files with the same filename/, stderr, 'Expected error message')
5454
assert_match(/#{fact1} => #{fact1_value}/, stdout, 'Expected fact to match first fact')
55-
assert_not_match(/#{fact2} => #{fact2_value}/, stdout, 'Expected fact not to match second fact')
55+
refute_match(/#{fact2} => #{fact2_value}/, stdout, 'Expected fact not to match second fact')
5656
end
5757
end
5858

acceptance/tests/options/config_file/ttls_cached_fact_in_multiple_groups.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
first_cat_output = agent.cat(first_cached_fact_file)
5151
assert_match(/#{cached_fact_name}/, first_cat_output.strip, "Expected cached fact file to contain fact information")
5252
second_cat_output = agent.cat(second_cached_fact_file)
53-
assert_not_match(/#{cached_fact_name}/, second_cat_output.strip, "Expected cached fact file to not contain fact information")
53+
refute_match(/#{cached_fact_name}/, second_cat_output.strip, "Expected cached fact file to not contain fact information")
5454
end
5555
end
5656
end

acceptance/tests/options/config_file/ttls_cached_facts_expire_facts_do_not_read_the_old_cached_value.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
agent.modified_at(cached_fact_file, '198001010000')
5151

5252
on(agent, facter("#{cached_factname}")) do |facter_output|
53-
assert_not_match(/#{cached_fact_value}/, facter_output.stdout, "Expected fact to not match the cached fact file")
53+
refute_match(/#{cached_fact_value}/, facter_output.stdout, "Expected fact to not match the cached fact file")
5454
end
5555
end
5656
end

0 commit comments

Comments
 (0)