[DRE-commits] [trocla] 04/05: Patch out rspec-pending_for usage

[zeha at debian.org]

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

zeha pushed a commit to annotated tag debian/0.2.3-1
in repository trocla.

commit 4b826d29668126206b7b3da30534523a38581433
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Mar 1 21:45:32 2016 +0100

    Patch out rspec-pending_for usage
---
 debian/patches/no-pending_for | 65 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 66 insertions(+)

diff --git a/debian/patches/no-pending_for b/debian/patches/no-pending_for
new file mode 100644
index 0000000..c882f93
--- /dev/null
+++ b/debian/patches/no-pending_for
@@ -0,0 +1,65 @@
+Index: trocla/spec/trocla/formats/x509_spec.rb
+===================================================================
+--- trocla.orig/spec/trocla/formats/x509_spec.rb
++++ trocla/spec/trocla/formats/x509_spec.rb
+@@ -184,18 +184,14 @@ describe "Trocla::Format::X509" do
+       ca2 = OpenSSL::X509::Certificate.new(ca2_str)
+       expect(ca2.issuer.to_s).to eq(@ca.subject.to_s)
+       expect((Date.parse(ca2.not_after.localtime.to_s) - Date.today).to_i).to eq(365)
+-      pending_for(:engine => 'jruby',:reason => 'NameConstraints verification seem to be broken in jRuby: https://github.com/jruby/jruby/issues/3502') do
+         expect(verify(@ca,ca2)).to be true
+-      end
+ 
+       expect(ca2.extensions.find{|e| e.oid == 'basicConstraints' }.value).to eq('CA:TRUE')
+       ku = ca2.extensions.find{|e| e.oid == 'keyUsage' }.value
+       expect(ku).to match(/Certificate Sign/)
+       expect(ku).to match(/CRL Sign/)
+       nc = ca2.extensions.find{|e| e.oid == 'nameConstraints' }.value
+-      pending_for(:engine => 'jruby',:reason => 'NameConstraints verification seem to be broken in jRuby: https://github.com/jruby/jruby/issues/3502') do
+         expect(nc).to match(/Permitted:\n  DNS:example.com\n  DNS:bla.example.net/)
+-      end
+       valid_cert_str = @trocla.password('myvalidexamplecert','x509', {
+         'subject'  => '/C=ZZ/O=Trocla Inc./CN=foo.example.com/emailAddress=example at example.com',
+         'ca' => 'mycert_with_nc'
+@@ -224,9 +220,7 @@ describe "Trocla::Format::X509" do
+       ca2 = OpenSSL::X509::Certificate.new(ca2_str)
+       expect(ca2.issuer.to_s).to eq(@ca.subject.to_s)
+       expect((Date.parse(ca2.not_after.localtime.to_s) - Date.today).to_i).to eq(365)
+-      pending_for(:engine => 'jruby',:reason => 'NameConstraints verification seem to be broken in jRuby: https://github.com/jruby/jruby/issues/3502') do
+         expect(verify(@ca,ca2)).to be true
+-      end
+ 
+       expect(ca2.extensions.find{|e| e.oid == 'basicConstraints' }.value).to eq('CA:TRUE')
+       ku = ca2.extensions.find{|e| e.oid == 'keyUsage' }.value
+@@ -245,9 +239,7 @@ describe "Trocla::Format::X509" do
+       if %x{openssl version} =~ /1\.0\.[2-9]/
+         expect(verify([@ca,ca2],valid_cert)).to be true
+       else
+-        skip_for(:engine => 'ruby',:reason => 'NameConstraints verification is broken on older openssl versions https://rt.openssl.org/Ticket/Display.html?id=3562') do
+           expect(verify([@ca,ca2],valid_cert)).to be true
+-        end
+       end
+ 
+       false_cert_str = @trocla.password('myfalseexamplecert','x509', {
+@@ -277,9 +269,7 @@ describe "Trocla::Format::X509" do
+       cert2 = OpenSSL::X509::Certificate.new(cert2_str)
+       expect(cert2.issuer.to_s).to eq(ca2.subject.to_s)
+       expect((Date.parse(cert2.not_after.localtime.to_s) - Date.today).to_i).to eq(365)
+-      skip_for(:engine => 'jruby',:reason => 'Chained CA validation seems to be broken on jruby atm.') do
+         expect(verify([@ca,ca2],cert2)).to be true
+-      end
+     end
+ 
+     it 'respects all options' do
+Index: trocla/spec/spec_helper.rb
+===================================================================
+--- trocla.orig/spec/spec_helper.rb
++++ trocla/spec/spec_helper.rb
+@@ -1,7 +1,6 @@
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+ $LOAD_PATH.unshift(File.dirname(__FILE__))
+ require 'rspec'
+-require 'rspec/pending_for'
+ require 'yaml'
+ require 'trocla'
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 26bfd54..aa06468 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_version.patch
+no-pending_for

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