[DRE-commits] [ruby-saml] 02/05: fix autopkgtest

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-saml.

commit 07fe7faa1d6508a4eeae8f83c50aa3f9e6fe70b9
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Oct 30 13:04:42 2016 +0530

    fix autopkgtest
---
 debian/changelog                          |  8 +++++++
 debian/patches/disable-failing-test.patch | 35 -------------------------------
 debian/patches/remove-bundler.patch       |  2 +-
 debian/patches/remove-simplecov.patch     |  4 +++-
 debian/patches/series                     |  2 +-
 debian/patches/use-system-lib.patch       | 21 +++++++++++++++++++
 6 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 975ad4d..eed6759 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-saml (1.4.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Refresh patches (remove disable-failing-test.patch, merged upstream)
+  * Fix autopkgtest (Closes: #830929)
+
+ -- Pirate Praveen <praveen at debian.org>  Sun, 30 Oct 2016 13:01:32 +0530
+
 ruby-saml (1.3.0-1) unstable; urgency=medium
 
   * New upstream release 
diff --git a/debian/patches/disable-failing-test.patch b/debian/patches/disable-failing-test.patch
deleted file mode 100644
index 465a75e..0000000
--- a/debian/patches/disable-failing-test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-File is missing
-https://github.com/onelogin/ruby-saml/issues/338
-
-Index: ruby-saml/test/response_test.rb
-===================================================================
---- ruby-saml.orig/test/response_test.rb
-+++ ruby-saml/test/response_test.rb
-@@ -1289,16 +1289,16 @@ class RubySamlTest < Minitest::Test
-     end
-   end
- 
--  describe "attack" do
--    it "should not be valid" do
--      settings.private_key = ruby_saml_key_text
--      signature_wrapping_attack = read_invalid_response("encrypted_new_attack.xml.base64")
--      response_wrapped = OneLogin::RubySaml::Response.new(signature_wrapping_attack, :settings => settings)
--      response_wrapped.stubs(:conditions).returns(nil)
--      response_wrapped.stubs(:validate_subject_confirmation).returns(true)
--      settings.idp_cert_fingerprint = "385b1eec71143f00db6af936e2ea12a28771d72c"
--      assert !response_wrapped.is_valid?
--    end
--  end
-+ # describe "attack" do
-+ #   it "should not be valid" do
-+ #     settings.private_key = ruby_saml_key_text
-+ #     signature_wrapping_attack = read_invalid_response("encrypted_new_attack.xml.base64")
-+ #     response_wrapped = OneLogin::RubySaml::Response.new(signature_wrapping_attack, :settings => settings)
-+ #     response_wrapped.stubs(:conditions).returns(nil)
-+ #     response_wrapped.stubs(:validate_subject_confirmation).returns(true)
-+ #     settings.idp_cert_fingerprint = "385b1eec71143f00db6af936e2ea12a28771d72c"
-+ #     assert !response_wrapped.is_valid?
-+ #   end
-+ # end
- 
- end
diff --git a/debian/patches/remove-bundler.patch b/debian/patches/remove-bundler.patch
index 5d2b764..0df31f3 100644
--- a/debian/patches/remove-bundler.patch
+++ b/debian/patches/remove-bundler.patch
@@ -4,7 +4,7 @@ Index: ruby-saml/test/test_helper.rb
 ===================================================================
 --- ruby-saml.orig/test/test_helper.rb
 +++ ruby-saml/test/test_helper.rb
-@@ -7,12 +7,13 @@
+@@ -8,12 +8,13 @@
  
  require 'stringio'
  require 'rubygems'
diff --git a/debian/patches/remove-simplecov.patch b/debian/patches/remove-simplecov.patch
index 7681a2e..73859dd 100644
--- a/debian/patches/remove-simplecov.patch
+++ b/debian/patches/remove-simplecov.patch
@@ -4,16 +4,18 @@ Index: ruby-saml/test/test_helper.rb
 ===================================================================
 --- ruby-saml.orig/test/test_helper.rb
 +++ ruby-saml/test/test_helper.rb
-@@ -1,9 +1,9 @@
+@@ -1,10 +1,10 @@
 -require 'simplecov'
 +#require 'simplecov'
  
 -SimpleCov.start do
 -  add_filter "test/"
+-  add_filter "vendor/"
 -  add_filter "lib/onelogin/ruby-saml/logging.rb"
 -end
 +#SimpleCov.start do
 +#  add_filter "test/"
++#  add_filter "vendor/"
 +#  add_filter "lib/onelogin/ruby-saml/logging.rb"
 +#end
  
diff --git a/debian/patches/series b/debian/patches/series
index b1ef9bf..838c966 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 remove-simplecov.patch
 remove-bundler.patch
 use-unshift-in-gemspec.patch
-disable-failing-test.patch
+use-system-lib.patch
diff --git a/debian/patches/use-system-lib.patch b/debian/patches/use-system-lib.patch
new file mode 100644
index 0000000..a00343e
--- /dev/null
+++ b/debian/patches/use-system-lib.patch
@@ -0,0 +1,21 @@
+Index: ruby-saml/test/test_helper.rb
+===================================================================
+--- ruby-saml.orig/test/test_helper.rb
++++ ruby-saml/test/test_helper.rb
+@@ -1,5 +1,7 @@
+ #require 'simplecov'
+ 
++require 'pathname'
++
+ #SimpleCov.start do
+ #  add_filter "test/"
+ #  add_filter "vendor/"
+@@ -240,7 +242,7 @@ class Minitest::Test
+     inflated
+   end
+ 
+-  SCHEMA_DIR = File.expand_path(File.join(__FILE__, '../../lib/schemas'))
++  SCHEMA_DIR = Pathname.new(File.expand_path(File.join(__FILE__, '../../lib/schemas'))).directory? ? File.expand_path(File.join(__FILE__, '../../lib/schemas')) : File.new('/usr/lib/ruby/vendor_ruby/saml/schemas')
+ 
+   #
+   # validate an xml document against the given schema

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