Merge branch 'master' into dependabot/github_actions/peter-evans/create-pull-request-6.0.5
This commit is contained in:
Коммит
b08f453fda
|
@ -91,7 +91,7 @@ module OctocatalogDiff
|
|||
facts_terminus = @options.fetch(:facts_terminus, 'yaml')
|
||||
if facts_terminus == 'yaml'
|
||||
cmdline << "--factpath=#{Shellwords.escape(File.join(@compilation_dir, 'var', 'yaml', 'facts'))}"
|
||||
if @options[:fact_file].is_a?(String) && @options[:fact_file] =~ /.*\.(\w+)$/
|
||||
if @options[:fact_file].is_a?(String) && @options[:fact_file] =~ /.*{1,1000}\.(\w+)$/
|
||||
fact_file = File.join(@compilation_dir, 'var', 'yaml', 'facts', "#{@node}.#{Regexp.last_match(1)}")
|
||||
FileUtils.cp @options[:fact_file], fact_file unless File.file?(fact_file) || @options[:fact_file] == fact_file
|
||||
end
|
||||
|
|
|
@ -343,8 +343,8 @@ describe OctocatalogDiff::Util::Parallel do
|
|||
expect(two_result.exception).to eq(nil)
|
||||
expect(two_result.output).to match(/^two def \d+$/)
|
||||
|
||||
one_time = Regexp.last_match(1).to_i if one_result.output =~ /(\d+)$/
|
||||
two_time = Regexp.last_match(1).to_i if two_result.output =~ /(\d+)$/
|
||||
one_time = Regexp.last_match(1).to_i if one_result.output =~ /(\d+{1,1000})$/
|
||||
two_time = Regexp.last_match(1).to_i if two_result.output =~ /(\d+{1,1000})$/
|
||||
expect(one_time).to be < two_time
|
||||
end
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче