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

Jump to bottom

CFINSPEC-528 Upgraded mock Ubuntu fixture to latest LTS version. #6351

Merged
merged 1 commit into from
Jan 3, 2023
Merged

CFINSPEC-528 Upgraded mock Ubuntu fixture to latest LTS version. #6351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/helpers/mock_loader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class MockLoader
macos10_10: { name: "mac_os_x", family: "darwin", release: "10.10.4", arch: nil },
macos10_16: { name: "darwin", family: "darwin", release: "10.16", arch: nil },
ubuntu1404: { name: "ubuntu", family: "debian", release: "14.04", arch: "x86_64" },
ubuntu: { name: "ubuntu", family: "debian", release: "20.04", arch: "x86_64" },
ubuntu: { name: "ubuntu", family: "debian", release: "22.04", arch: "x86_64" },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to keep 20.04 and 22.04 both and remove the Versions which is EOL like Ubuntu 14.04. Could you please confirm this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are right. That makes sense. Thanks I will make the changes.

mint17: { name: "linuxmint", family: "debian", release: "17.3", arch: "x86_64" },
mint18: { name: "linuxmint", family: "debian", release: "18", arch: "x86_64" },
windows: { name: "windows", family: "windows", release: "6.2.9200", arch: "x86_64" },
Expand Down
16 changes: 8 additions & 8 deletions test/unit/profiles/metadata_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ def from_yaml(str)
_(m).must_be :supports_platform?, backend
end

it "loads a profile which supports release 20.04" do
m = supports_meta({ "release" => "20.04" })
it "loads a profile which supports release 22.04" do
m = supports_meta({ "release" => "22.04" })
_(m).must_be :supports_platform?, backend
end

Expand All @@ -163,13 +163,13 @@ def from_yaml(str)
_(m).wont_be :supports_platform?, backend
end

it "loads a profile which supports ubuntu 20.04" do
m = supports_meta({ "os-name" => "ubuntu", "release" => "20.04" })
it "loads a profile which supports ubuntu 22.04" do
m = supports_meta({ "os-name" => "ubuntu", "release" => "22.04" })
_(m).must_be :supports_platform?, backend
end

it "loads a profile which supports ubuntu 20.*" do
m = supports_meta({ "os-name" => "ubuntu", "release" => "20.*" })
it "loads a profile which supports ubuntu 22.*" do
m = supports_meta({ "os-name" => "ubuntu", "release" => "22.*" })
_(m).must_be :supports_platform?, backend
end

Expand All @@ -183,8 +183,8 @@ def from_yaml(str)
_(m).wont_be :supports_platform?, backend
end

it "loads a profile which supports ubuntu float 20.04 as parsed by yml" do
m = supports_meta({ "os-name" => "ubuntu", "release" => 20.04 })
it "loads a profile which supports ubuntu float 22.04 as parsed by yml" do
m = supports_meta({ "os-name" => "ubuntu", "release" => 22.04 })
_(m).must_be :supports_platform?, backend
end

Expand Down
2 changes: 1 addition & 1 deletion test/unit/resources/os_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
resource = MockLoader.new(:ubuntu).load_resource("os")
_(resource.name).must_equal "ubuntu"
_(resource.family).must_equal "debian"
_(resource.release).must_equal "20.04"
_(resource.release).must_equal "22.04"
_(resource.arch).must_equal "x86_64"
end

Expand Down
12 changes: 6 additions & 6 deletions test/unit/resources/platform_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
it "verify platform parsing on Ubuntu" do
_(resource.name).must_equal "ubuntu"
_(resource.family).must_equal "debian"
_(resource.release).must_equal "20.04"
_(resource.release).must_equal "22.04"
_(resource.arch).must_equal "x86_64"
end

it "verify platform hash parsing on Ubuntu" do
_(resource[:name]).must_equal "ubuntu"
_(resource[:family]).must_equal "debian"
_(resource[:release]).must_equal "20.04"
_(resource[:release]).must_equal "22.04"
_(resource[:arch]).must_equal "x86_64"
end

Expand Down Expand Up @@ -71,18 +71,18 @@
_(resource).wont_be :supported?, supports
end

it "loads a profile which supports release 20.04" do
it "loads a profile which supports release 22.04" do
supports = [
{ 'os-family': "windows", 'os-name': "windows_2000" },
{ 'os-name': "ubuntu", 'release': "20.04" },
{ 'os-name': "ubuntu", 'release': "22.04" },
]
_(resource).must_be :supported?, supports
end

it "loads a profile which supports release 20.*" do
it "loads a profile which supports release 22.*" do
supports = [
{ 'os-family': "windows", 'os-name': "windows_2000" },
{ 'os-name': "ubuntu", 'release': "20.*" },
{ 'os-name': "ubuntu", 'release': "22.*" },
]
_(resource).must_be :supported?, supports
end
Expand Down
2 changes: 1 addition & 1 deletion test/unit/resources/wmi_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
resource = MockLoader.new(:ubuntu).load_resource("wmi", { class: "win32_service", filter: "name like '%winrm%'" })
_(resource.resource_failed?).must_equal true
_(resource.resource_exception_message)
.must_equal "Resource `wmi` is not supported on platform ubuntu/20.04."
.must_equal "Resource `wmi` is not supported on platform ubuntu/22.04."
_(resource.resource_id).must_equal "win32_service"
end
end