[DRE-commits] [test-kitchen] 29/39: Refresh patches
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Fri Aug 5 12:46:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository test-kitchen.
commit a6e1bbacece1c79de50f53b1e49f7d118d0cb8e3
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Thu Mar 24 17:48:24 2016 +0300
Refresh patches
---
.../0001-Do-not-run-test-for-winrm-transport.patch | 4 ++--
...emove-useless-gem-minitest-from-spec_helper.patch | 2 +-
debian/patches/0003-Remove-CI-stuff.patch | 2 +-
...nge-LOAD_PATH-and-do-not-use-rubygems-in-b.patch} | 0
...arch-for-support-in-usr-share-test-kitchen.patch} | 12 ++++++------
...e-test-failing-under-Gem2Deb-Rake-TestTask.patch} | 0
...emplates-in-usr-share-test-kitchen-templat.patch} | 4 ++--
...l-pry.patch => 0008-Use-apt-to-install-pry.patch} | 0
...emove-Gemfile-to-prevent-bundler-execution.patch} | 0
...AD_PATH.patch => 0010-Hack-Clear-LOAD_PATH.patch} | 2 +-
...ests.patch => 0011-Disable-networked-tests.patch} | 14 ++++++++++----
...Do-not-run-gem-install-during-kitchen-init.patch} | 6 +++---
...nore-cucumber-test-which-fail-under-sbuild.patch} | 0
debian/patches/series | 20 ++++++++++----------
14 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch b/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
index 920ac4c..1bb05f9 100644
--- a/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
+++ b/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
@@ -36,7 +36,7 @@ index f0c1c32..dda98a8 100644
Given a file named ".kitchen.yml" with:
"""
diff --git a/spec/kitchen/transport/winrm_spec.rb b/spec/kitchen/transport/winrm_spec.rb
-index 6af55a3..cdbd601 100644
+index 152f8ff..71c96fc 100644
--- a/spec/kitchen/transport/winrm_spec.rb
+++ b/spec/kitchen/transport/winrm_spec.rb
@@ -15,7 +15,7 @@
@@ -48,7 +48,7 @@ index 6af55a3..cdbd601 100644
require_relative "../../spec_helper"
require "kitchen/transport/winrm"
-@@ -1147,3 +1147,4 @@ MSG
+@@ -1141,3 +1141,4 @@ MSG
%r{^W, .* : #{Regexp.escape(msg)}}
end
end
diff --git a/debian/patches/0002-Remove-useless-gem-minitest-from-spec_helper.patch b/debian/patches/0002-Remove-useless-gem-minitest-from-spec_helper.patch
index 748d1c2..c6ee293 100644
--- a/debian/patches/0002-Remove-useless-gem-minitest-from-spec_helper.patch
+++ b/debian/patches/0002-Remove-useless-gem-minitest-from-spec_helper.patch
@@ -7,7 +7,7 @@ Subject: Remove useless 'gem "minitest"' from spec_helper
1 file changed, 2 deletions(-)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 08de316..c92f41d 100644
+index b107bd5..7a8475a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,8 +16,6 @@
diff --git a/debian/patches/0003-Remove-CI-stuff.patch b/debian/patches/0003-Remove-CI-stuff.patch
index d009831..3ceba22 100644
--- a/debian/patches/0003-Remove-CI-stuff.patch
+++ b/debian/patches/0003-Remove-CI-stuff.patch
@@ -7,7 +7,7 @@ Subject: Remove CI stuff
1 file changed, 17 deletions(-)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index c92f41d..707680f 100644
+index 7a8475a..1c49327 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,23 +16,6 @@
diff --git a/debian/patches/0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch b/debian/patches/0004-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
similarity index 100%
rename from debian/patches/0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
rename to debian/patches/0004-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
diff --git a/debian/patches/0006-Search-for-support-in-usr-share-test-kitchen.patch b/debian/patches/0005-Search-for-support-in-usr-share-test-kitchen.patch
similarity index 92%
rename from debian/patches/0006-Search-for-support-in-usr-share-test-kitchen.patch
rename to debian/patches/0005-Search-for-support-in-usr-share-test-kitchen.patch
index 6a38270..b2db20c 100644
--- a/debian/patches/0006-Search-for-support-in-usr-share-test-kitchen.patch
+++ b/debian/patches/0005-Search-for-support-in-usr-share-test-kitchen.patch
@@ -10,7 +10,7 @@ Subject: Search for support/ in /usr/share/test-kitchen/
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/kitchen/provisioner/base.rb b/lib/kitchen/provisioner/base.rb
-index 4e16b3d..0c2d447 100644
+index edbd4b7..bce54a5 100644
--- a/lib/kitchen/provisioner/base.rb
+++ b/lib/kitchen/provisioner/base.rb
@@ -195,7 +195,7 @@ module Kitchen
@@ -23,10 +23,10 @@ index 4e16b3d..0c2d447 100644
)
diff --git a/lib/kitchen/provisioner/chef_zero.rb b/lib/kitchen/provisioner/chef_zero.rb
-index e2f5c6e..4defece 100644
+index 2cbaa55..a0da4a9 100644
--- a/lib/kitchen/provisioner/chef_zero.rb
+++ b/lib/kitchen/provisioner/chef_zero.rb
-@@ -185,7 +185,7 @@ module Kitchen
+@@ -198,7 +198,7 @@ module Kitchen
debug("Using a vendored chef-client-zero.rb")
source = File.join(File.dirname(__FILE__),
@@ -35,7 +35,7 @@ index e2f5c6e..4defece 100644
FileUtils.cp(source, File.join(sandbox_path, "chef-client-zero.rb"))
end
-@@ -211,7 +211,7 @@ module Kitchen
+@@ -224,7 +224,7 @@ module Kitchen
debug("Using a dummy validation.pem")
source = File.join(File.dirname(__FILE__),
@@ -58,10 +58,10 @@ index 19dada2..1de0204 100644
end
end
diff --git a/lib/kitchen/verifier/base.rb b/lib/kitchen/verifier/base.rb
-index c6ba95d..22561b7 100644
+index 1bfaa23..52237d5 100644
--- a/lib/kitchen/verifier/base.rb
+++ b/lib/kitchen/verifier/base.rb
-@@ -200,7 +200,7 @@ module Kitchen
+@@ -202,7 +202,7 @@ module Kitchen
def shell_code_from_file(vars, file)
src_file = File.join(
File.dirname(__FILE__),
diff --git a/debian/patches/0007-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch b/debian/patches/0006-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch
similarity index 100%
rename from debian/patches/0007-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch
rename to debian/patches/0006-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch
diff --git a/debian/patches/0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch b/debian/patches/0007-Look-for-templates-in-usr-share-test-kitchen-templat.patch
similarity index 95%
rename from debian/patches/0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch
rename to debian/patches/0007-Look-for-templates-in-usr-share-test-kitchen-templat.patch
index 45f4e21..893b06a 100644
--- a/debian/patches/0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch
+++ b/debian/patches/0007-Look-for-templates-in-usr-share-test-kitchen-templat.patch
@@ -8,7 +8,7 @@ Subject: Look for templates in /usr/share/test-kitchen/templates/
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/kitchen/generator/driver_create.rb b/lib/kitchen/generator/driver_create.rb
-index 6e2a3f8..919ab8e 100644
+index 5af32c3..4196d81 100644
--- a/lib/kitchen/generator/driver_create.rb
+++ b/lib/kitchen/generator/driver_create.rb
@@ -39,7 +39,9 @@ module Kitchen
@@ -23,7 +23,7 @@ index 6e2a3f8..919ab8e 100644
create_core_files
create_source_files
diff --git a/lib/kitchen/generator/init.rb b/lib/kitchen/generator/init.rb
-index 67f021d..fa69cbf 100644
+index c14d7a7..475337a 100644
--- a/lib/kitchen/generator/init.rb
+++ b/lib/kitchen/generator/init.rb
@@ -58,7 +58,9 @@ module Kitchen
diff --git a/debian/patches/0009-Use-apt-to-install-pry.patch b/debian/patches/0008-Use-apt-to-install-pry.patch
similarity index 100%
rename from debian/patches/0009-Use-apt-to-install-pry.patch
rename to debian/patches/0008-Use-apt-to-install-pry.patch
diff --git a/debian/patches/0010-Remove-Gemfile-to-prevent-bundler-execution.patch b/debian/patches/0009-Remove-Gemfile-to-prevent-bundler-execution.patch
similarity index 100%
rename from debian/patches/0010-Remove-Gemfile-to-prevent-bundler-execution.patch
rename to debian/patches/0009-Remove-Gemfile-to-prevent-bundler-execution.patch
diff --git a/debian/patches/0011-Hack-Clear-LOAD_PATH.patch b/debian/patches/0010-Hack-Clear-LOAD_PATH.patch
similarity index 93%
rename from debian/patches/0011-Hack-Clear-LOAD_PATH.patch
rename to debian/patches/0010-Hack-Clear-LOAD_PATH.patch
index 0e307d2..d41c7e4 100644
--- a/debian/patches/0011-Hack-Clear-LOAD_PATH.patch
+++ b/debian/patches/0010-Hack-Clear-LOAD_PATH.patch
@@ -7,7 +7,7 @@ Subject: Hack: Clear $LOAD_PATH
1 file changed, 1 insertion(+)
diff --git a/features/support/env.rb b/features/support/env.rb
-index dad6a73..f7bdcab 100644
+index ff24c6d..29dc62b 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,4 +1,5 @@
diff --git a/debian/patches/0012-Disable-networked-tests.patch b/debian/patches/0011-Disable-networked-tests.patch
similarity index 53%
rename from debian/patches/0012-Disable-networked-tests.patch
rename to debian/patches/0011-Disable-networked-tests.patch
index 17f6e9e..471c39c 100644
--- a/debian/patches/0012-Disable-networked-tests.patch
+++ b/debian/patches/0011-Disable-networked-tests.patch
@@ -3,14 +3,14 @@ Date: Thu, 9 Jul 2015 17:46:21 +0300
Subject: Disable networked tests
---
- features/kitchen_driver_discover_command.feature | 5 -----
- 1 file changed, 5 deletions(-)
+ features/kitchen_driver_discover_command.feature | 11 -----------
+ 1 file changed, 11 deletions(-)
diff --git a/features/kitchen_driver_discover_command.feature b/features/kitchen_driver_discover_command.feature
-index 6ebefd3..d7741a2 100644
+index 58b7488..d7741a2 100644
--- a/features/kitchen_driver_discover_command.feature
+++ b/features/kitchen_driver_discover_command.feature
-@@ -12,8 +12,3 @@ Feature: Search RubyGems to discover new Test Kitchen Driver gems
+@@ -12,14 +12,3 @@ Feature: Search RubyGems to discover new Test Kitchen Driver gems
kitchen driver discover
"""
And the exit status should be 0
@@ -19,3 +19,9 @@ index 6ebefd3..d7741a2 100644
- When I run `kitchen driver discover`
- Then the exit status should be 0
- And the output should contain "kitchen-bluebox"
+-
+- Scenario: Running driver discover with the --chef-config-path parameter loads the chef config
+- Given an empty file named "kitchen_client.rb"
+- When I run `kitchen driver discover --chef-config-path=kitchen_client.rb`
+- Then the exit status should be 0
+- And the output should contain "kitchen-bluebox"
diff --git a/debian/patches/0013-Do-not-run-gem-install-during-kitchen-init.patch b/debian/patches/0012-Do-not-run-gem-install-during-kitchen-init.patch
similarity index 93%
rename from debian/patches/0013-Do-not-run-gem-install-during-kitchen-init.patch
rename to debian/patches/0012-Do-not-run-gem-install-during-kitchen-init.patch
index fdfcd7b..938568e 100644
--- a/debian/patches/0013-Do-not-run-gem-install-during-kitchen-init.patch
+++ b/debian/patches/0012-Do-not-run-gem-install-during-kitchen-init.patch
@@ -8,10 +8,10 @@ Subject: Do not run `gem install` during `kitchen init`
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/features/kitchen_init_command.feature b/features/kitchen_init_command.feature
-index 0e2de6d..3683f28 100644
+index a1527a2..1c6e57a 100644
--- a/features/kitchen_init_command.feature
+++ b/features/kitchen_init_command.feature
-@@ -30,7 +30,7 @@ Feature: Add Test Kitchen support to an existing project
+@@ -32,7 +32,7 @@ Feature: Add Test Kitchen support to an existing project
And a file named "Gemfile" should not exist
And a file named "Rakefile" should not exist
And a file named "Thorfile" should not exist
@@ -21,7 +21,7 @@ index 0e2de6d..3683f28 100644
And the file "chefignore" should contain ".kitchen"
diff --git a/lib/kitchen/generator/init.rb b/lib/kitchen/generator/init.rb
-index fa69cbf..1cdd803 100644
+index 475337a..f57b1ae 100644
--- a/lib/kitchen/generator/init.rb
+++ b/lib/kitchen/generator/init.rb
@@ -239,7 +239,13 @@ module Kitchen
diff --git a/debian/patches/0014-Ignore-cucumber-test-which-fail-under-sbuild.patch b/debian/patches/0013-Ignore-cucumber-test-which-fail-under-sbuild.patch
similarity index 100%
rename from debian/patches/0014-Ignore-cucumber-test-which-fail-under-sbuild.patch
rename to debian/patches/0013-Ignore-cucumber-test-which-fail-under-sbuild.patch
diff --git a/debian/patches/series b/debian/patches/series
index 708f59e..5076fa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,13 @@
0001-Do-not-run-test-for-winrm-transport.patch
0002-Remove-useless-gem-minitest-from-spec_helper.patch
0003-Remove-CI-stuff.patch
-0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
-0006-Search-for-support-in-usr-share-test-kitchen.patch
-0007-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch
-0008-Look-for-templates-in-usr-share-test-kitchen-templat.patch
-0009-Use-apt-to-install-pry.patch
-0010-Remove-Gemfile-to-prevent-bundler-execution.patch
-0011-Hack-Clear-LOAD_PATH.patch
-0012-Disable-networked-tests.patch
-0013-Do-not-run-gem-install-during-kitchen-init.patch
-0014-Ignore-cucumber-test-which-fail-under-sbuild.patch
+0004-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
+0005-Search-for-support-in-usr-share-test-kitchen.patch
+0006-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch
+0007-Look-for-templates-in-usr-share-test-kitchen-templat.patch
+0008-Use-apt-to-install-pry.patch
+0009-Remove-Gemfile-to-prevent-bundler-execution.patch
+0010-Hack-Clear-LOAD_PATH.patch
+0011-Disable-networked-tests.patch
+0012-Do-not-run-gem-install-during-kitchen-init.patch
+0013-Ignore-cucumber-test-which-fail-under-sbuild.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/test-kitchen.git
More information about the Pkg-ruby-extras-commits
mailing list