Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

start fixing main tests #534

Merged
merged 2 commits into from
Mar 19, 2024
Merged

start fixing main tests #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3354509
fix minitest after tests call to newer, non-deprecated style
geemus Mar 19, 2024
4aee4a0
update/fix yaml safe load arguments in recursive hot file loader
geemus Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ def get_template_contents(template_file)
template = template_file
elsif template_is_raw?(template_file)
template_base_url = local_base_url
template = YAML.safe_load(template_file, [Date])
template = YAML.safe_load(template_file, :permitted_classes => [Date])
elsif template_is_url?(template_file)
template_file = normalise_file_path_to_url(template_file)
template_base_url = base_url_for_url(template_file)
raw_template = read_uri(template_file)
template = YAML.safe_load(raw_template, [Date])
template = YAML.safe_load(raw_template, :permitted_classes => [Date])

Fog::Logger.debug("Template visited: #{@visited}")
@visited.add(template_file)
Expand Down Expand Up @@ -212,7 +212,7 @@ def normalise_file_path_to_url(path)
def deep_copy(item)
return item if item.kind_of?(String)

YAML.safe_load(YAML.dump(item), [Date])
YAML.safe_load(YAML.dump(item), :permitted_classes => [Date])
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion test/requests/compute/address_tests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def compute
self.class.compute
end

MiniTest::Unit.after_tests do
Minitest.after_run do
compute.delete_server(server_id)
end

Expand Down
Loading