[DRE-commits] [ruby-mixlib-install] 11/15: Refresh old and add new patches
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Thu Aug 4 15:43:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository ruby-mixlib-install.
commit d6ed84b16632018dd418c00ae758b4d2952f1e50
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Thu Aug 4 17:28:29 2016 +0300
Refresh old and add new patches
---
...001-Look-for-support-scripts-in-usr-share.patch | 2 +-
.../patches/0002-Disable-artifactory-usage.patch | 24 +++-
...03-Disable-vcr-usage-as-it-s-not-packaged.patch | 59 ++++++++
debian/patches/0004-Stub-real-HTTP-requests.patch | 160 +++++++++++++++++++++
.../0005-Don-t-modify-LOAD_PATH-in-specs.patch | 19 +++
...isable-test-requiring-files-from-usr-shar.patch | 18 +++
.../0007-Disable-tests-using-artifactory.patch | 67 +++++++++
debian/patches/series | 5 +
8 files changed, 351 insertions(+), 3 deletions(-)
diff --git a/debian/patches/0001-Look-for-support-scripts-in-usr-share.patch b/debian/patches/0001-Look-for-support-scripts-in-usr-share.patch
index 4b091fe..1e070e0 100644
--- a/debian/patches/0001-Look-for-support-scripts-in-usr-share.patch
+++ b/debian/patches/0001-Look-for-support-scripts-in-usr-share.patch
@@ -1,5 +1,5 @@
From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 30 May 2016 16:38:01 +0300
+Date: Thu, 4 Aug 2016 13:14:48 +0300
Subject: Look for support scripts in /usr/share
---
diff --git a/debian/patches/0002-Disable-artifactory-usage.patch b/debian/patches/0002-Disable-artifactory-usage.patch
index 87d5ae3..da5dcaf 100644
--- a/debian/patches/0002-Disable-artifactory-usage.patch
+++ b/debian/patches/0002-Disable-artifactory-usage.patch
@@ -1,5 +1,5 @@
From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 30 May 2016 16:54:15 +0300
+Date: Thu, 4 Aug 2016 17:27:31 +0300
Subject: Disable artifactory usage
This works in local chef.io network only
@@ -8,7 +8,8 @@ This works in local chef.io network only
lib/mixlib/install/generator/bourne.rb | 3 +--
lib/mixlib/install/generator/powershell.rb | 4 ++--
mixlib-install.gemspec | 1 -
- 4 files changed, 4 insertions(+), 7 deletions(-)
+ spec/mixlib/install/artifactory_spec.rb | 4 ++++
+ 5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/mixlib/install/backend.rb b/lib/mixlib/install/backend.rb
index 7560859..9a809a1 100644
@@ -86,3 +87,22 @@ index b619a7e..5dffda3 100644
spec.add_dependency "mixlib-versioning"
spec.add_dependency "mixlib-shellout"
+diff --git a/spec/mixlib/install/artifactory_spec.rb b/spec/mixlib/install/artifactory_spec.rb
+index 5ba3d58..2795fcf 100644
+--- a/spec/mixlib/install/artifactory_spec.rb
++++ b/spec/mixlib/install/artifactory_spec.rb
+@@ -15,6 +15,8 @@
+ # limitations under the License.
+ #
+
++=begin Disabled because Debian package doesn't support Artifactory
++
+ require "spec_helper"
+
+ require "mixlib/install/options"
+@@ -84,3 +86,5 @@ context "Mixlib::Install::Backend::Artifactory", :vcr do
+ end
+ end
+ end
++
++=end
diff --git a/debian/patches/0003-Disable-vcr-usage-as-it-s-not-packaged.patch b/debian/patches/0003-Disable-vcr-usage-as-it-s-not-packaged.patch
new file mode 100644
index 0000000..832c8bd
--- /dev/null
+++ b/debian/patches/0003-Disable-vcr-usage-as-it-s-not-packaged.patch
@@ -0,0 +1,59 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 16 Jun 2016 19:27:27 +0300
+Subject: Disable vcr usage as it's not packaged
+
+---
+ spec/spec_helper.rb | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index abe74b7..421d315 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -2,7 +2,6 @@
+ $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+ require "webmock/rspec"
+-require "vcr"
+
+ # load version manifest support path
+ VERSION_MANIFEST_DIR = File.expand_path("../support/version_manifests", __FILE__)
+@@ -16,38 +15,6 @@ RSpec.configure do |config|
+ end
+ end
+
+-#
+-# vcr configuration
+-#
+-# There are a couple cases where you will need to play with these settings:
+-# 1-) Updating cached responses:
+-# Set 'default_cassette_options' to '{ :record => :all }' and run tests.
+-# 2-) If you add new tests or change the code to talk to different APIs,
+-# you will see spec failures because we lock down the http connections by
+-# disabling 'allow_http_connections_when_no_cassette'. In this case what
+-# you need to do is:
+-# Set 'default_cassette_options' to '{ :record => :new_episodes }' and
+-# run tests.
+-#
+-VCR.configure do |config|
+- config.cassette_library_dir = File.join(File.dirname(__FILE__), "fixtures/vcr")
+- config.hook_into :webmock
+- config.configure_rspec_metadata!
+- # Options to be used during development:
+- #
+- # Enables vcr logger for debugging
+- # config.debug_logger = File.open("vcr.log", 'w')
+- #
+- # Fails the specs if we get an http connection that we do not expect
+- # config.allow_http_connections_when_no_cassette = true
+- #
+- # Re-records all http calls on top of existing fixtures
+- # config.default_cassette_options = { :record => :all }
+- #
+- # Records new http calls without changing existing fixtures
+- # config.default_cassette_options = { :record => :new_episodes }
+-end
+-
+ # Copied directly from
+ # https://github.com/ScrappyAcademy/rock_candy/blob/master/lib/rock_candy/helpers.rb
+ # Thank you, @cupakromer
diff --git a/debian/patches/0004-Stub-real-HTTP-requests.patch b/debian/patches/0004-Stub-real-HTTP-requests.patch
new file mode 100644
index 0000000..7c7f4ea
--- /dev/null
+++ b/debian/patches/0004-Stub-real-HTTP-requests.patch
@@ -0,0 +1,160 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 4 Aug 2016 09:05:04 +0300
+Subject: Stub real HTTP requests
+
+---
+ spec/mixlib/install/backend/bintray_spec.rb | 35 ++++++++++++++++++++---
+ spec/mixlib/install_spec.rb | 12 ++++++++
+ spec/spec_helper.rb | 2 ++
+ spec/webmocks.rb | 43 +++++++++++++++++++++++++++++
+ 4 files changed, 88 insertions(+), 4 deletions(-)
+ create mode 100644 spec/webmocks.rb
+
+diff --git a/spec/mixlib/install/backend/bintray_spec.rb b/spec/mixlib/install/backend/bintray_spec.rb
+index faa3a20..f39c777 100644
+--- a/spec/mixlib/install/backend/bintray_spec.rb
++++ b/spec/mixlib/install/backend/bintray_spec.rb
+@@ -44,7 +44,33 @@ context "Mixlib::Install::Backend::Bintray", :vcr do
+ end
+
+ let(:mixlib_options) { Mixlib::Install::Options.new(options) }
+- let(:bintray) { Mixlib::Install::Backend::Bintray.new(mixlib_options) }
++ let(:bintray) do
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chef/versions/_latest").
++ to_return(:status => 200, :body => CHEF_VERSIONS_LATEST, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chef/versions/12.12.15/files").
++ to_return(:status => 200, :body => CHEF_VERSIONS_12_12_15_FILES, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/_latest").
++ to_return(:status => 200, :body => CHEFDK_VERSIONS_LATEST, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/0.16.28/files").
++ to_return(:status => 200, :body => CHEFDK_VERSIONS_0_16_28_FILES, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/v
++ersions/_latest").
++ to_return(:status => 200, :body => CHEF_32_ON_64, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/v
++ersions/_latest").
++ to_return(:status => 200, :body => CHEF_64_ON_64, :headers => {}) # TODO: not works
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chef/versions/12.4.1/files").
++ to_return(:status => 200, :body => CHEF_VERSIONS_12_4_1_FILES, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/compliance/versions/1.3.1/files").
++ to_return(:status => 200, :body => COMPLIANCE_1_3_1_FILES, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/compliance/versions/_latest").
++ to_return(:status => 200, :body => COMPLIANCE_LATEST, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/versions/99.99.99/files").
++ with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
++ to_return(:status => [404, "Not Found"], :body => %q|{"message":"Version '99.99.99' was not found"}|, :headers => {})
++
++ Mixlib::Install::Backend::Bintray.new(mixlib_options)
++ end
+ let(:artifact_info) { bintray.info }
+
+ context "for chef/stable with :latest version" do
+@@ -52,6 +78,7 @@ context "Mixlib::Install::Backend::Bintray", :vcr do
+ let(:product_name) { "chef" }
+ let(:product_version) { :latest }
+
++
+ it "returns all artifacts" do
+ expect(artifact_info.size).to be > 1
+ end
+@@ -63,12 +90,12 @@ context "Mixlib::Install::Backend::Bintray", :vcr do
+
+ it "returns a single artifact with correct info" do
+ expect(artifact_info).to be_a Mixlib::Install::ArtifactInfo
+- expect(artifact_info.version).to eq "12.9.38"
++ expect(artifact_info.version).to eq "12.12.15"
+ expect(artifact_info.platform).to eq "ubuntu"
+ expect(artifact_info.platform_version).to eq "14.04"
+ expect(artifact_info.architecture).to eq "x86_64"
+- expect(artifact_info.sha256).to eq "255c065a9d23f3dd0df3090206fe4d48451c7d0af0035c237bd21a7d28133f2f"
+- expect(artifact_info.url).to eq "https://packages.chef.io/stable/ubuntu/14.04/chef_12.9.38-1_amd64.deb"
++ expect(artifact_info.sha256).to eq "d64a029bc5402e2c2e2e1ad479e8b49b3dc7599a9d50ea3cefe4149b070582be"
++ expect(artifact_info.url).to eq "https://packages.chef.io/stable/ubuntu/14.04/chef_12.12.15-1_amd64.deb"
+ end
+ end
+ end
+diff --git a/spec/mixlib/install_spec.rb b/spec/mixlib/install_spec.rb
+index 31f5ffc..5bec77e 100644
+--- a/spec/mixlib/install_spec.rb
++++ b/spec/mixlib/install_spec.rb
+@@ -20,6 +20,18 @@ require "mixlib/install"
+
+ context "Mixlib::Install" do
+ let(:installer) do
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/_latest").
++ with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
++ to_return(:status => 200, :body => CHEFDK_VERSIONS_LATEST, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/0.16.28/files").
++ with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
++ to_return(:status => 200, :body => CHEFDK_VERSIONS_0_16_28_FILES, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/0.3.0/files").
++ with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
++ to_return(:status => 200, :body => CHEFDK_VERSIONS_0_3_0_FILES, :headers => {})
++ stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/0.7.0/files").
++ with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
++ to_return(:status => 200, :body => CHEFDK_VERSIONS_0_7_0_FILES, :headers => {})
+ Mixlib::Install.new(
+ product_name: product_name,
+ channel: channel,
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 421d315..cd360e4 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -3,6 +3,8 @@ $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+ require "webmock/rspec"
+
++require "webmocks"
++
+ # load version manifest support path
+ VERSION_MANIFEST_DIR = File.expand_path("../support/version_manifests", __FILE__)
+
+diff --git a/spec/webmocks.rb b/spec/webmocks.rb
+new file mode 100644
+index 0000000..e58200a
+--- /dev/null
++++ b/spec/webmocks.rb
+@@ -0,0 +1,43 @@
++CHEF_VERSIONS_LATEST = <<END
++{"name":"12.12.15","desc":"","package":"chef","repo":"stable","owner":"chef","labels":[],"attribute_names":["project","version","iteration"],"created":"2016-07-09T21:36:46.593Z","updated":"2016-07-20T22:20:18.820Z","released":"","ordinal":73.0}
++END
++
++CHEF_VERSIONS_12_12_15_FILES = <<END
++[{"name":"chef-12.12.15-1.powerpc.bff","path":"aix/6.1/chef-12.12.15-1.powerpc.bff","repo":"stable","package":"chef","version":"12.12.15","owner":"chef","created":"2016-07-09T21:37:54.709Z","size":78424064,"sha1":"28ab1cc09e73499fb629b46d2b950a4517d5fd61","sha256":"fef1d4019e40f1a9f645bbc4cdaa5f43f5aeafc49add74bafb1501238ad88e62"},{"name":"chef-12.12.15-1.powerpc.bff.asc","path":"aix/6.1/chef-12.12.15-1.powerpc.bff.asc","repo":"stable","package":"chef","version":"12.12.15","owner":"chef [...]
++END
++
++CHEF_VERSIONS_12_4_1_FILES = <<END
++[{"name":"chef-12.4.1-1.powerpc.bff","path":"aix/6.1/chef-12.4.1-1.powerpc.bff","repo":"stable","package":"chef","version":"12.4.1","owner":"chef","created":"2016-02-25T22:39:21.746Z","size":89447424,"sha1":"c237f063bf378b5368581df5cc4e22a7d00a4554","sha256":"e802ee74cf0b406f4eb2bea5674e4d371880e8558fe69c3b29e158488e7a7d7b"},{"name":"chef-12.4.1-1.powerpc.bff.asc","path":"aix/6.1/chef-12.4.1-1.powerpc.bff.asc","repo":"stable","package":"chef","version":"12.4.1","owner":"chef","created": [...]
++END
++
++CHEFDK_VERSIONS_LATEST = <<END
++{"name":"0.16.28","desc":"","package":"chefdk","repo":"stable","owner":"chef","labels":[],"attribute_names":["project","version","iteration"],"created":"2016-07-20T19:01:30.184Z","updated":"2016-07-20T19:04:40.107Z","released":"","ordinal":25.0}
++END
++
++CHEFDK_VERSIONS_0_16_28_FILES = <<END
++[{"name":"chefdk_0.16.28-1_amd64.deb","path":"debian/6/chefdk_0.16.28-1_amd64.deb","repo":"stable","package":"chefdk","version":"0.16.28","owner":"chef","created":"2016-07-20T19:02:04.952Z","size":130386164,"sha1":"c76f491007ba41d2d7fc83f51fe545efc9d6cb6a","sha256":"35cd6bc37822576faea4fb81819ec59907d8abb02d623ef3a0141e845a3812c0"},{"name":"chefdk_0.16.28-1_amd64.deb.asc","path":"debian/6/chefdk_0.16.28-1_amd64.deb.asc","repo":"stable","package":"chefdk","version":"0.16.28","owner":"che [...]
++END
++
++CHEFDK_VERSIONS_0_7_0_FILES = <<END
++[{"name":"chefdk_0.7.0-1_amd64.deb","path":"debian/6/chefdk_0.7.0-1_amd64.deb","repo":"stable","package":"chefdk","version":"0.7.0","owner":"chef","created":"2016-02-25T20:11:03.698Z","size":131732954,"sha1":"bb41a8f5986dd0b8a6f959d0f39c8b9f3b1e9560","sha256":"9fa98dd60109528f015a9cc6bde93de88ad6763b8dc2396a7bedb6b33a7dcfa6"},{"name":"chefdk_0.7.0-1_amd64.deb.asc","path":"debian/6/chefdk_0.7.0-1_amd64.deb.asc","repo":"stable","package":"chefdk","version":"0.7.0","owner":"chef","created" [...]
++END
++
++CHEFDK_VERSIONS_0_3_0_FILES = <<END
++[{"name":"chefdk_0.3.0-1_amd64.deb","path":"debian/6/chefdk_0.3.0-1_amd64.deb","repo":"stable","package":"chefdk","version":"0.3.0","owner":"chef","created":"2016-02-25T19:27:14.684Z","size":120953888,"sha1":"ade92f1d227ad9f48ac21ad4b0c47932504b35e0","sha256":"6953b43954c22376c47d35ebe0c3a26fa5707aeee4925e5bd4888388c7030ea7"},{"name":"chefdk_0.3.0-1_amd64.deb.asc","path":"debian/6/chefdk_0.3.0-1_amd64.deb.asc","repo":"stable","package":"chefdk","version":"0.3.0","owner":"chef","created" [...]
++END
++
++COMPLIANCE_LATEST = <<END
++{"name":"1.3.1","desc":"","package":"compliance","repo":"stable","owner":"chef","labels":[],"attribute_names":["project","version","iteration"],"created":"2016-05-31T14:22:15.274Z","updated":"2016-05-31T14:24:09.579Z","released":"","ordinal":25.0}
++END
++
++COMPLIANCE_1_3_1_FILES = <<END
++[{"name":"chef-compliance-1.3.1-1.el6.x86_64.rpm","path":"el/6/chef-compliance-1.3.1-1.el6.x86_64.rpm","repo":"stable","package":"compliance","version":"1.3.1","owner":"chef","created":"2016-05-31T14:22:34.857Z","size":116943777,"sha1":"0835159bc557b39c13dcc86b4b065a200b953f2a","sha256":"a3efef917a15ca17680950ea7c39656fd43d248173e88af05bd7e1e33b8067a0"},{"name":"chef-compliance-1.3.1-1.el6.x86_64.rpm.asc","path":"el/6/chef-compliance-1.3.1-1.el6.x86_64.rpm.asc","repo":"stable","package" [...]
++END
++
++CHEF_32_ON_64 = <<END
++{"name":"12.13.16","desc":"","package":"chef","repo":"current","owner":"chef","labels":[],"attribute_names":["project","version","iteration"],"created":"2016-07-29T15:11:35.680Z","updated":"2016-07-29T15:13:38.131Z","released":"","ordinal":57.0}
++END
++
++CHEF_64_ON_64 = <<END
++{"name":"12.13.16","desc":"","package":"chef","repo":"current","owner":"chef","labels":[],"attribute_names":["project","version","iteration"],"created":"2016-07-29T15:11:35.680Z","updated":"2016-07-29T15:13:38.131Z","released":"","ordinal":57.0}
++END
diff --git a/debian/patches/0005-Don-t-modify-LOAD_PATH-in-specs.patch b/debian/patches/0005-Don-t-modify-LOAD_PATH-in-specs.patch
new file mode 100644
index 0000000..370e7a9
--- /dev/null
+++ b/debian/patches/0005-Don-t-modify-LOAD_PATH-in-specs.patch
@@ -0,0 +1,19 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 4 Aug 2016 10:03:18 +0300
+Subject: Don't modify $LOAD_PATH in specs
+
+---
+ spec/spec_helper.rb | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index cd360e4..525b3d2 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,6 +1,3 @@
+-# load lib path
+-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+-
+ require "webmock/rspec"
+
+ require "webmocks"
diff --git a/debian/patches/0006-Temporary-disable-test-requiring-files-from-usr-shar.patch b/debian/patches/0006-Temporary-disable-test-requiring-files-from-usr-shar.patch
new file mode 100644
index 0000000..9a7b011
--- /dev/null
+++ b/debian/patches/0006-Temporary-disable-test-requiring-files-from-usr-shar.patch
@@ -0,0 +1,18 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 4 Aug 2016 13:50:33 +0300
+Subject: Temporary disable test requiring files from /usr/share
+
+---
+ spec/mixlib/install/script_generator_spec.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/mixlib/install/script_generator_spec.rb b/spec/mixlib/install/script_generator_spec.rb
+index 3c958e5..f273163 100644
+--- a/spec/mixlib/install/script_generator_spec.rb
++++ b/spec/mixlib/install/script_generator_spec.rb
+@@ -151,4 +151,4 @@ describe Mixlib::Install::ScriptGenerator do
+
+ end
+ end
+-end
++end if false # temporary support script is not found
diff --git a/debian/patches/0007-Disable-tests-using-artifactory.patch b/debian/patches/0007-Disable-tests-using-artifactory.patch
new file mode 100644
index 0000000..2a5fac2
--- /dev/null
+++ b/debian/patches/0007-Disable-tests-using-artifactory.patch
@@ -0,0 +1,67 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 4 Aug 2016 14:37:10 +0300
+Subject: Disable tests using artifactory
+
+---
+ spec/mixlib/install/backend_spec.rb | 8 ++++----
+ spec/mixlib/install/generator_spec.rb | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/spec/mixlib/install/backend_spec.rb b/spec/mixlib/install/backend_spec.rb
+index 26d3a49..5690823 100644
+--- a/spec/mixlib/install/backend_spec.rb
++++ b/spec/mixlib/install/backend_spec.rb
+@@ -78,19 +78,19 @@ context "Mixlib::Install::Backend", :vcr do
+ end
+
+ shared_examples_for "the right artifact info" do
+- it "has the right properties" do
++ xit "has the right properties" do
+ check_url(info.url)
+ check_sha256(info.sha256)
+ check_version(info.version)
+ end
+
+- it "has the right platform info" do
++ xit "has the right platform info" do
+ check_platform_info(info)
+ end
+ end
+
+ shared_examples_for "the right artifact list info" do
+- it "has the correct number of platforms" do
++ xit "has the correct number of platforms" do
+ # Currently we have 7 platforms in stable and 6 platforms in current.
+ # We can add more in the future
+ expect(info.map(&:platform).uniq.length).to be >= 6
+@@ -100,7 +100,7 @@ context "Mixlib::Install::Backend", :vcr do
+ end
+ end
+
+- it "has the right properties for artifacts" do
++ xit "has the right properties for artifacts" do
+ info.each do |artifact_info|
+ check_url(artifact_info.url)
+ check_sha256(artifact_info.sha256)
+diff --git a/spec/mixlib/install/generator_spec.rb b/spec/mixlib/install/generator_spec.rb
+index dade991..602dc60 100644
+--- a/spec/mixlib/install/generator_spec.rb
++++ b/spec/mixlib/install/generator_spec.rb
+@@ -37,7 +37,7 @@ context "Mixlib::Install::Generator" do
+ }
+
+ shared_examples_for "the correct sh script" do
+- it "generates an sh script" do
++ xit "generates an sh script" do
+ expect(install_script).to be_a(String)
+ expect(install_script).to start_with("#!/bin/sh")
+ expect(install_script).to include('install_file $filetype "$download_filename"')
+@@ -51,7 +51,7 @@ context "Mixlib::Install::Generator" do
+ context "default shell type" do
+ it_behaves_like "the correct sh script"
+
+- it "contains artifactory urls" do
++ xit "contains artifactory urls" do
+ expect(install_script).to include('artifact_info_for_platform="$tmp_dir/artifact_info/$platform/$platform_version/$machine/artifact_info"
+ ')
+ end
diff --git a/debian/patches/series b/debian/patches/series
index f3fbd43..127b894 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,7 @@
0001-Look-for-support-scripts-in-usr-share.patch
0002-Disable-artifactory-usage.patch
+0003-Disable-vcr-usage-as-it-s-not-packaged.patch
+0004-Stub-real-HTTP-requests.patch
+0005-Don-t-modify-LOAD_PATH-in-specs.patch
+0006-Temporary-disable-test-requiring-files-from-usr-shar.patch
+0007-Disable-tests-using-artifactory.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mixlib-install.git
More information about the Pkg-ruby-extras-commits
mailing list