|
|
d10a9dc |
From 9743c857481556838ee417a0033efdee3fb0c7fc Mon Sep 17 00:00:00 2001
|
|
|
d10a9dc |
From: sophia <scastellarin95@gmail.com>
|
|
|
d10a9dc |
Date: Tue, 3 Jan 2023 13:20:14 -0800
|
|
|
d10a9dc |
Subject: [PATCH] Only check for arguments matching test string if the argument
|
|
|
d10a9dc |
is a string
|
|
|
d10a9dc |
|
|
|
d10a9dc |
This issue surfaced in the tests after updating to Ruby 3.2.0 where
|
|
|
d10a9dc |
the =~ operator has been removed.
|
|
|
d10a9dc |
|
|
|
d10a9dc |
ref: https://github.com/ruby/ruby/blob/cca54c8b1b71072bb07850c9d3f20b261d3b312c/NEWS.md?plain=1#L498
|
|
|
d10a9dc |
---
|
|
|
d10a9dc |
test/unit/plugins/provisioners/ansible/provisioner_test.rb | 6 +++---
|
|
|
d10a9dc |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
d10a9dc |
|
|
|
d10a9dc |
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
|
|
|
d10a9dc |
index f5828f14340..fdf9aa67eaa 100644
|
|
|
d10a9dc |
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
|
|
|
d10a9dc |
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
|
|
|
d10a9dc |
@@ -91,7 +91,7 @@ def self.it_should_set_arguments_and_environment_variables(
|
|
|
d10a9dc |
expect(args[1]).to eq("--connection=ssh")
|
|
|
d10a9dc |
expect(args[2]).to eq("--timeout=30")
|
|
|
d10a9dc |
|
|
|
d10a9dc |
- inventory_count = args.count { |x| x =~ /^--inventory-file=.+$/ }
|
|
|
d10a9dc |
+ inventory_count = args.count { |x| x.match(/^--inventory-file=.+$/) if x.is_a?(String) }
|
|
|
d10a9dc |
expect(inventory_count).to be > 0
|
|
|
d10a9dc |
|
|
|
d10a9dc |
expect(args[args.length-2]).to eq("playbook.yml")
|
|
|
d10a9dc |
@@ -100,9 +100,9 @@ def self.it_should_set_arguments_and_environment_variables(
|
|
|
d10a9dc |
|
|
|
d10a9dc |
it "sets --limit argument" do
|
|
|
d10a9dc |
expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
|
|
|
d10a9dc |
- all_limits = args.select { |x| x =~ /^(--limit=|-l)/ }
|
|
|
d10a9dc |
+ all_limits = args.select { |x| x.match(/^(--limit=|-l)/) if x.is_a?(String) }
|
|
|
d10a9dc |
if config.raw_arguments
|
|
|
d10a9dc |
- raw_limits = config.raw_arguments.select { |x| x =~ /^(--limit=|-l)/ }
|
|
|
d10a9dc |
+ raw_limits = config.raw_arguments.select { |x| x.match(/^(--limit=|-l)/) if x.is_a?(String) }
|
|
|
d10a9dc |
expect(all_limits.length - raw_limits.length).to eq(1)
|
|
|
d10a9dc |
expect(all_limits.last).to eq(raw_limits.last)
|
|
|
d10a9dc |
else
|