Skip to content

Commit 529b670

Browse files
committed
Fix unit test
1 parent 79e291f commit 529b670

File tree

1 file changed

+12
-16
lines changed
  • cookbooks/aws-parallelcluster-platform/spec/unit/resources

1 file changed

+12
-16
lines changed

cookbooks/aws-parallelcluster-platform/spec/unit/resources/dcv_spec.rb

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,9 @@ def self.nothing(chef_run)
3838
end
3939

4040
context 'when on arm' do
41-
before do
41+
it "is true" do
4242
allow_any_instance_of(Object).to receive(:arm_instance?).and_return(true)
43-
end
44-
45-
case "#{platform}#{version}"
46-
when "amazon2023"
47-
it "is false" do
48-
expect(resource.dcv_supported?).to eq(false)
49-
end
50-
else
51-
it "is true" do
52-
expect(resource.dcv_supported?).to eq(true)
53-
end
43+
expect(resource.dcv_supported?).to eq(true)
5444
end
5545

5646
it 'executes nothing action of dcv resource' do
@@ -59,10 +49,9 @@ def self.nothing(chef_run)
5949
end
6050

6151
context 'when not on arm' do
62-
is_supported = !("#{platform}#{version}" == 'amazon2023')
63-
it "is #{is_supported}" do
52+
it "is true" do
6453
allow_any_instance_of(Object).to receive(:arm_instance?).and_return(false)
65-
expect(resource.dcv_supported?).to eq(is_supported)
54+
expect(resource.dcv_supported?).to eq(true)
6655
end
6756
end
6857
end
@@ -144,7 +133,14 @@ def self.nothing(chef_run)
144133
expect(resource.xdcv).to eq("nice-xdcv_#{xdcv_version}_#{dcv_pkg_arch}.#{base_os}.deb")
145134
expect(resource.dcv_web_viewer).to eq("nice-dcv-web-viewer_#{dcv_webviewer_version}_#{dcv_pkg_arch}.#{base_os}.deb")
146135
expect(resource.dcv_gl).to eq("/nice-dcv-gl_#{dcv_gl_version}_#{dcv_pkg_arch}.#{base_os}.deb")
147-
elsif "#{platform}#{version}" != 'amazon2023'
136+
elsif "#{platform}#{version}" == "amazon2023"
137+
dcv_platform_version_pkg = "amzn2023"
138+
expect(resource.dcv_package).to eq("nice-dcv-#{dcv_version}-#{dcv_platform_version_pkg}-#{dcv_url_arch}")
139+
expect(resource.dcv_server).to eq("nice-dcv-server-#{dcv_server_version}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
140+
expect(resource.xdcv).to eq("nice-xdcv-#{xdcv_version}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
141+
expect(resource.dcv_web_viewer).to eq("nice-dcv-web-viewer-#{dcv_webviewer_version}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
142+
expect(resource.dcv_gl).to eq("nice-dcv-gl-#{dcv_gl_version}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
143+
else
148144
dcv_platform_version = "#{platform}#{version}" == "amazon2" ? "7" : version.to_i
149145
dcv_platform_version_pkg = platform == "amazon" ? "amzn2" : "el" + version
150146
expect(resource.dcv_package).to eq("nice-dcv-#{dcv_version}-#{dcv_platform_version_pkg}-#{dcv_url_arch}")

0 commit comments

Comments
 (0)