[DRE-commits] [chef] 04/13: Blacklist windows test, makes 1 patch obsolete

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository chef.

commit 1ff4244b9e6983efecc57b0855f28306cf56dcc5
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 4 13:16:28 2016 -0300

    Blacklist windows test, makes 1 patch obsolete
---
 debian/changelog                                   |  1 -
 .../0002-remove-windows-dependency-in-tests.patch  | 63 ----------------------
 debian/patches/series                              |  1 -
 debian/ruby-tests.blacklist                        |  1 +
 4 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 437d16b..ae0bafe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,6 @@ chef (12.7.2-1) UNRELEASED; urgency=medium
   * Declare compliance with Debian policy 3.9.8
   * Create debian/ruby-tests.rake to run tests during the build
   * debian/control: add ruby-cheffish as new build dependency
-  * Create patch to skip Windows stuff in tests
 
   [ Antonio Terceiro ]
   * debian/tests/control:
diff --git a/debian/patches/0002-remove-windows-dependency-in-tests.patch b/debian/patches/0002-remove-windows-dependency-in-tests.patch
deleted file mode 100644
index 88767d1..0000000
--- a/debian/patches/0002-remove-windows-dependency-in-tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Skip Windows related tests
- These tests depends on wmi-lite gem that it is related with Windows.
-Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
-Last-Updated: 2016-05-04
-
---- a/spec/functional/win32/version_info_spec.rb
-+++ b/spec/functional/win32/version_info_spec.rb
-@@ -22,29 +22,31 @@ if Chef::Platform.windows?
- end
- 
- describe "Chef::ReservedNames::Win32::File::VersionInfo", :windows_only do
--  require "wmi-lite/wmi"
--  let(:file_path) { ENV["ComSpec"] }
--  let(:os_version) do
--    wmi = WmiLite::Wmi.new
--    os_info = wmi.first_of("Win32_OperatingSystem")
--    os_info["version"]
--  end
--
--  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)
--  end
--
--  it "product version has the same version as windows" do
--    expect(subject.ProductVersion).to start_with(os_version)
--  end
--
--  it "company is microsoft" do
--    expect(subject.CompanyName).to eq("Microsoft Corporation")
--  end
--
--  it "file description is command processor" do
--    expect(subject.FileDescription).to eq("Windows Command Processor")
-+  skip "is skipped because of Windows dependencies" do
-+    require "wmi-lite/wmi"
-+    let(:file_path) { ENV["ComSpec"] }
-+    let(:os_version) do
-+      wmi = WmiLite::Wmi.new
-+      os_info = wmi.first_of("Win32_OperatingSystem")
-+      os_info["version"]
-+    end
-+
-+    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)
-+    end
-+
-+    it "product version has the same version as windows" do
-+      expect(subject.ProductVersion).to start_with(os_version)
-+    end
-+
-+    it "company is microsoft" do
-+      expect(subject.CompanyName).to eq("Microsoft Corporation")
-+    end
-+
-+    it "file description is command processor" do
-+      expect(subject.FileDescription).to eq("Windows Command Processor")
-+    end
-   end
- end
diff --git a/debian/patches/series b/debian/patches/series
index 23f80a9..86136dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0002-remove-windows-dependency-in-tests.patch
 0001-gemspec-update.patch
diff --git a/debian/ruby-tests.blacklist b/debian/ruby-tests.blacklist
index 7594119..323d066 100644
--- a/debian/ruby-tests.blacklist
+++ b/debian/ruby-tests.blacklist
@@ -13,6 +13,7 @@ spec/functional/resource/remote_file_spec.rb
 spec/functional/resource/user/useradd_spec.rb
 spec/functional/rest_spec.rb
 spec/functional/tiny_server_spec.rb
+spec/functional/win32/version_info_spec.rb
 spec/integration/client/client_spec.rb
 spec/integration/client/ipv6_spec.rb
 spec/integration/knife/chef_fs_data_store_spec.rb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git