diff --git a/rubygem-dalli-2.7.6-Use-assert_nil-in-tests.patch b/rubygem-dalli-2.7.6-Use-assert_nil-in-tests.patch new file mode 100644 index 0000000..951eb7f --- /dev/null +++ b/rubygem-dalli-2.7.6-Use-assert_nil-in-tests.patch @@ -0,0 +1,125 @@ +From 6d3243e7f41166b9fe57a64df066b1d1ec27164c Mon Sep 17 00:00:00 2001 +From: Pavel Valena +Date: Tue, 22 Aug 2017 13:42:43 +0200 +Subject: [PATCH] Use `assert_nil` in tests + +instead of `assert_equal nil`, because it produces errors with activesupport >= 5.1.3. +--- + test/test_active_support.rb | 16 ++++++++-------- + test/test_dalli.rb | 8 ++++---- + test/test_encoding.rb | 2 +- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/test/test_active_support.rb b/test/test_active_support.rb +index eca4322..6313b4c 100644 +--- a/test/test_active_support.rb ++++ b/test/test_active_support.rb +@@ -84,7 +84,7 @@ def self.it_with_and_without_local_cache(message, &block) + with_cache cache_nils: true do + @dalli.write('nil', nil) + dvalue = @dalli.fetch('nil') { flunk } +- assert_equal nil, dvalue ++ assert_nil dvalue + end + + with_cache cache_nils: false do +@@ -281,7 +281,7 @@ def self.it_with_and_without_local_cache(message, &block) + @dalli.delete(y) + Dalli::Client.any_instance.expects(:get).with(y, {}).once.returns(nil) + dres = @dalli.read(y) +- assert_equal nil, dres ++ assert_nil dres + end + end + end +@@ -320,15 +320,15 @@ def self.it_with_and_without_local_cache(message, &block) + assert_equal 6, @dalli.increment('counterY1', 1, :initial => 5) + assert_equal 6, @dalli.read('counterY1', :raw => true).to_i + +- assert_equal nil, @dalli.increment('counterZ1', 1, :initial => nil) +- assert_equal nil, @dalli.read('counterZ1') ++ assert_nil @dalli.increment('counterZ1', 1, :initial => nil) ++ assert_nil @dalli.read('counterZ1') + + assert_equal 5, @dalli.decrement('counterY2', 1, :initial => 5) + assert_equal 4, @dalli.decrement('counterY2', 1, :initial => 5) + assert_equal 4, @dalli.read('counterY2', :raw => true).to_i + +- assert_equal nil, @dalli.decrement('counterZ2', 1, :initial => nil) +- assert_equal nil, @dalli.read('counterZ2') ++ assert_nil @dalli.decrement('counterZ2', 1, :initial => nil) ++ assert_nil @dalli.read('counterZ2') + + user = MockUser.new + assert op_addset_succeeds(@dalli.write(user, 0, :raw => true)) +@@ -369,7 +369,7 @@ def self.it_with_and_without_local_cache(message, &block) + memcached_kill(new_port) + + silence_logger do +- assert_equal @dalli.read('foo'), nil ++ assert_nil @dalli.read('foo') + end + end + +@@ -446,7 +446,7 @@ def self.it_with_and_without_local_cache(message, &block) + + it 'supports connection pooling' do + with_cache :expires_in => 1, :namespace => 'foo', :compress => true, :pool_size => 3 do +- assert_equal nil, @dalli.read('foo') ++ assert_nil @dalli.read('foo') + assert @dalli.write('foo', 1) + assert_equal 1, @dalli.fetch('foo') { raise 'boom' } + assert_equal true, @dalli.dalli.is_a?(ConnectionPool) +diff --git a/test/test_dalli.rb b/test/test_dalli.rb +index ac404b0..0d36877 100644 +--- a/test/test_dalli.rb ++++ b/test/test_dalli.rb +@@ -143,7 +143,7 @@ + + it 'returns nil for nonexist key' do + memcached_persistent do |dc| +- assert_equal nil, dc.get('notexist') ++ assert_nil dc.get('notexist') + end + end + +@@ -234,7 +234,7 @@ + + dc.set("fetch_key", nil) + res = dc.fetch("fetch_key") { flunk "fetch block called" } +- assert_equal nil, res ++ assert_nil res + end + + memcached_persistent(21345, cache_nils: false) do |dc| +@@ -507,7 +507,7 @@ + assert_equal 'bar', dc.get(:foo) + + resp = dc.get('123') +- assert_equal nil, resp ++ assert_nil resp + + assert op_addset_succeeds(dc.set('123', 'xyz')) + +@@ -561,7 +561,7 @@ + assert_equal 'bar', dc.get(:foo) + + resp = dc.get('123') +- assert_equal nil, resp ++ assert_nil resp + + assert op_addset_succeeds(dc.set('123', 'xyz')) + +diff --git a/test/test_encoding.rb b/test/test_encoding.rb +index 8f03e4a..7daf874 100644 +--- a/test/test_encoding.rb ++++ b/test/test_encoding.rb +@@ -22,7 +22,7 @@ + assert dc.set(key, 'bar', 1) + assert_equal 'bar', dc.get(key) + sleep 1.2 +- assert_equal nil, dc.get(key) ++ assert_nil dc.get(key) + end + end + end diff --git a/rubygem-dalli.spec b/rubygem-dalli.spec index 6639a90..b23a9a1 100644 --- a/rubygem-dalli.spec +++ b/rubygem-dalli.spec @@ -5,7 +5,7 @@ Name: rubygem-%{gem_name} Version: 2.7.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High performance memcached client for Ruby License: MIT URL: https://github.com/petergoldstein/dalli @@ -13,6 +13,11 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git clone https://github.com/petergoldstein/dalli.git && cd dalli # git checkout v2.7.6 && tar czvf dalli-2.7.6-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz + +# Use 'assert_nil ...' instead of 'assert_equal nil, ...' +# https://github.com/petergoldstein/dalli/pull/661 +Patch0: rubygem-dalli-2.7.6-Use-assert_nil-in-tests.patch + BuildRequires: ruby(release) BuildRequires: rubygems-devel %if 0%{enable_test} > 0 @@ -57,6 +62,7 @@ cp -pa .%{gem_dir}/* \ %if 0%{enable_test} > 0 pushd .%{gem_instdir} tar xzvf %{SOURCE1} +cat %{PATCH0} | patch -p1 sed -i '/bundler/ s/^/#/' test/helper.rb ruby -Ilib:test -e "Dir.glob('./test/test_*.rb').sort.each{ |x| require x }" popd @@ -76,6 +82,9 @@ popd %{gem_instdir}/Gemfile %changelog +* Wed Aug 30 2017 Pavel Valena - 2.7.6-3 +- Fix FTBFS(tests only) in rawhide. + * Thu Jul 27 2017 Fedora Release Engineering - 2.7.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild