diff options
| author | Tim Smith <tsmith@chef.io> | 2020-04-02 11:09:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 11:09:38 -0700 |
| commit | 53eb91975c1261632d5f767c1421fba3b84d518e (patch) | |
| tree | 2f0e9a0cfda9f6db9d549c57ce9bc6f4851dae59 | |
| parent | 4d2b90eb91185d38cf314d9c75a00a092828d7ae (diff) | |
| parent | 074f1c93fbc5577c428770b0c8ececc22bee660b (diff) | |
| download | chef-53eb91975c1261632d5f767c1421fba3b84d518e.tar.gz | |
Merge pull request #9575 from chef/windows_10_tester
Add a Windows 10 tester to the pipeline
| -rw-r--r-- | .expeditor/release.omnibus.yml | 1 | ||||
| -rw-r--r-- | spec/functional/win32/version_info_spec.rb | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index b19f3fc0cc..ff5756aa39 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -55,3 +55,4 @@ builder-to-testers-map: - windows-2012r2-x86_64 - windows-2016-x86_64 - windows-2019-x86_64 + - windows-10-x86_64 diff --git a/spec/functional/win32/version_info_spec.rb b/spec/functional/win32/version_info_spec.rb index 988339fd7a..2c5cd63357 100644 --- a/spec/functional/win32/version_info_spec.rb +++ b/spec/functional/win32/version_info_spec.rb @@ -32,12 +32,12 @@ describe "Chef::ReservedNames::Win32::File::VersionInfo", :windows_only do subject { Chef::ReservedNames::Win32::File::VersionInfo.new(file_path) } - it "file version has the same version as windows" do - expect(subject.FileVersion).to start_with(os_version) + it "file version has the same major.minor version as windows" do + expect(subject.FileVersion).to start_with(os_version.rpartition(".").first) end - it "product version has the same version as windows" do - expect(subject.ProductVersion).to start_with(os_version) + it "product version has the same major.minor version as windows" do + expect(subject.ProductVersion).to start_with(os_version.rpartition(".").first) end it "company is microsoft" do |