[DRE-commits] [ruby-em-synchrony] 05/16: Refresh existent patches
Lucas Kanashiro
kanashiro.duarte at gmail.com
Wed Mar 2 12:44:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
kanashiro-guest pushed a commit to branch master
in repository ruby-em-synchrony.
commit 31be194d424dce5f58e9f93db82308db0afd615a
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date: Tue Mar 1 18:54:10 2016 -0300
Refresh existent patches
---
debian/changelog | 1 +
debian/patches/disable-amqp.patch | 16 ++++++++--------
debian/patches/disable-connection-pool-tests.patch | 15 ++++-----------
debian/patches/disable-failing-activerecord-tests.patch | 12 ++++++------
debian/patches/disable-network-tests.patch | 2 +-
debian/patches/disable-redis-auth.test | 9 +--------
6 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 93e1592..8a55153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-em-synchrony (1.0.4-1) UNRELEASED; urgency=medium
* Imported Upstream version 1.0.4
* Create patch to fix tests with ruby2.3 (Closes: #800029)
* Create patch to remove relative requires from tests
+ * Refresh existent patches
-- Lucas Kanashiro <kanashiro.duarte at gmail.com> Tue, 01 Mar 2016 18:36:38 -0300
diff --git a/debian/patches/disable-amqp.patch b/debian/patches/disable-amqp.patch
index b8f5779..2a3e8a5 100644
--- a/debian/patches/disable-amqp.patch
+++ b/debian/patches/disable-amqp.patch
@@ -5,7 +5,7 @@ Last-Updated: 2014-05-04
--- a/spec/amqp_spec.rb
+++ b/spec/amqp_spec.rb
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,7 @@ require "spec/helper/all"
describe EM::Synchrony::AMQP do
@@ -14,7 +14,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
connection = EM::Synchrony::AMQP.connect
connection.connected?.should be_true
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ describe EM::Synchrony::AMQP do
end
end
@@ -23,7 +23,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
connection = EM::Synchrony::AMQP.connect
connection.disconnect
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ describe EM::Synchrony::AMQP do
end
end
@@ -32,7 +32,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
connection = EM::Synchrony::AMQP.connect
channel = EM::Synchrony::AMQP::Channel.new(connection)
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ describe EM::Synchrony::AMQP do
end
end
@@ -41,7 +41,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
connection = EM::Synchrony::AMQP.connect
channel = EM::Synchrony::AMQP::Channel.new(connection)
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ describe EM::Synchrony::AMQP do
end
end
@@ -50,7 +50,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
connection = EM::Synchrony::AMQP.connect
channel = EM::Synchrony::AMQP::Channel.new(connection)
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ describe EM::Synchrony::AMQP do
end
end
@@ -59,7 +59,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
connection = EM::Synchrony::AMQP.connect
channel = EM::Synchrony::AMQP::Channel.new(connection)
-@@ -67,7 +67,7 @@
+@@ -65,7 +65,7 @@ describe EM::Synchrony::AMQP do
end
end
@@ -68,7 +68,7 @@ Last-Updated: 2014-05-04
nb_msg = 10
EM.synchrony do
connection = EM::Synchrony::AMQP.connect
-@@ -104,7 +104,7 @@
+@@ -102,7 +102,7 @@ describe EM::Synchrony::AMQP do
end
end
diff --git a/debian/patches/disable-connection-pool-tests.patch b/debian/patches/disable-connection-pool-tests.patch
index 3fcebec..02a09c7 100644
--- a/debian/patches/disable-connection-pool-tests.patch
+++ b/debian/patches/disable-connection-pool-tests.patch
@@ -5,7 +5,7 @@ Last-Updated: 2014-05-04
--- a/spec/connection_pool_spec.rb
+++ b/spec/connection_pool_spec.rb
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ QUERY = "select sleep(#{DELAY})"
describe EventMachine::Synchrony::ConnectionPool do
@@ -14,7 +14,7 @@ Last-Updated: 2014-05-04
EventMachine.run do
db = EventMachine::Synchrony::ConnectionPool.new(size: 1) do
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ describe EventMachine::Synchrony::Connec
end
end
@@ -23,7 +23,7 @@ Last-Updated: 2014-05-04
EventMachine.run do
db = EventMachine::Synchrony::ConnectionPool.new(size: 2) do
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ describe EventMachine::Synchrony::Connec
end
end
@@ -32,7 +32,7 @@ Last-Updated: 2014-05-04
EventMachine.run do
db = EventMachine::Synchrony::ConnectionPool.new(size: 2) do
-@@ -84,7 +84,7 @@
+@@ -84,7 +84,7 @@ describe EventMachine::Synchrony::Connec
end
end
@@ -41,10 +41,3 @@ Last-Updated: 2014-05-04
EventMachine.run do
db = EventMachine::Synchrony::ConnectionPool.new(size: 5) do
-@@ -126,4 +126,4 @@
- end
- end
-
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/disable-failing-activerecord-tests.patch b/debian/patches/disable-failing-activerecord-tests.patch
index 1b32c78..448257f 100644
--- a/debian/patches/disable-failing-activerecord-tests.patch
+++ b/debian/patches/disable-failing-activerecord-tests.patch
@@ -5,7 +5,7 @@ Last-Updated: 2014-05-04
--- a/spec/activerecord_spec.rb
+++ b/spec/activerecord_spec.rb
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ describe "Fiberized ActiveRecord driver
end
end
@@ -14,7 +14,7 @@ Last-Updated: 2014-05-04
EventMachine.synchrony do
establish_connection
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ describe "Fiberized ActiveRecord driver
end
end
@@ -23,7 +23,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
establish_connection
EM::Synchrony::FiberIterator.new(1..100, 40).each do |i|
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ describe "Fiberized ActiveRecord driver
end
end
@@ -32,7 +32,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
establish_connection
Widget.create
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ describe "Fiberized ActiveRecord driver
end
end
@@ -41,7 +41,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
establish_connection
ActiveRecord::Base.connection.execute("TRUNCATE TABLE widgets;")
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ describe "Fiberized ActiveRecord driver
end
describe "transactions" do
@@ -50,7 +50,7 @@ Last-Updated: 2014-05-04
EM.synchrony do
establish_connection
EM::Synchrony::FiberIterator.new(1..50, 30).each do |i|
-@@ -106,4 +106,4 @@
+@@ -106,4 +106,4 @@ describe "Fiberized ActiveRecord driver
end
end
diff --git a/debian/patches/disable-network-tests.patch b/debian/patches/disable-network-tests.patch
index 4ed5993..855f712 100644
--- a/debian/patches/disable-network-tests.patch
+++ b/debian/patches/disable-network-tests.patch
@@ -5,7 +5,7 @@ Last-Updated: 2014-05-04
--- a/spec/tcpsocket_spec.rb
+++ b/spec/tcpsocket_spec.rb
-@@ -400,7 +400,7 @@
+@@ -474,7 +474,7 @@ describe EventMachine::Synchrony::TCPSoc
end
context 'when wrapped in a connection pool' do
diff --git a/debian/patches/disable-redis-auth.test b/debian/patches/disable-redis-auth.test
index 3e81b4d..a4b01eb 100644
--- a/debian/patches/disable-redis-auth.test
+++ b/debian/patches/disable-redis-auth.test
@@ -5,7 +5,7 @@ Last-Updated: 2014-05-04
--- a/spec/redis_spec.rb
+++ b/spec/redis_spec.rb
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ describe EM::Protocols::Redis do
end
end
@@ -14,10 +14,3 @@ Last-Updated: 2014-05-04
EventMachine.synchrony do
redis = EM::Protocols::Redis.connect
redis.auth('abc')
-@@ -102,4 +102,4 @@
- EM.stop
- end
- end
--end
-\ No newline at end of file
-+end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-em-synchrony.git
More information about the Pkg-ruby-extras-commits
mailing list