[DRE-commits] [ruby-em-synchrony] 04/16: Create patch to remove relative requires from tests

[Lucas Kanashiro]

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 28e1cabb2f8af18dc87b2cd69bdcc2812512f1a7
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Tue Mar 1 18:46:48 2016 -0300

    Create patch to remove relative requires from tests
---
 debian/changelog                                   |  1 +
 .../remove-relative-require-from-tests.patch       | 47 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/start_services_and_auto_install.sh          |  5 ++-
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dd21e8..93e1592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,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
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Tue, 01 Mar 2016 18:36:38 -0300
 
diff --git a/debian/patches/remove-relative-require-from-tests.patch b/debian/patches/remove-relative-require-from-tests.patch
new file mode 100644
index 0000000..d17144b
--- /dev/null
+++ b/debian/patches/remove-relative-require-from-tests.patch
@@ -0,0 +1,47 @@
+Description: Remove relative requires from tests
+ Remove relative require is necessary for autopkgtest, because with this it
+ will fail.
+Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
+Last-Updated: 2016-03-01
+Forward: not-needed
+
+--- a/spec/helper/all.rb
++++ b/spec/helper/all.rb
+@@ -1,11 +1,11 @@
+ require 'spec/helper/core'
+-require 'lib/em-synchrony/mysql2'
+-require 'lib/em-synchrony/em-remcached'
+-require 'lib/em-synchrony/em-memcache'
+-require 'lib/em-synchrony/em-mongo'
+-require 'lib/em-synchrony/em-redis'
+-require 'lib/em-synchrony/em-hiredis'
+-require 'lib/em-synchrony/amqp'
++require 'em-synchrony/mysql2'
++require 'em-synchrony/em-remcached'
++require 'em-synchrony/em-memcache'
++require 'em-synchrony/em-mongo'
++require 'em-synchrony/em-redis'
++require 'em-synchrony/em-hiredis'
++require 'em-synchrony/amqp'
+ 
+ require 'helper/tolerance_matcher'
+ require 'helper/stub-http-server'
+--- a/spec/mongo_spec.rb
++++ b/spec/mongo_spec.rb
+@@ -1,5 +1,5 @@
+ require 'spec/helper/all'
+-require 'lib/em-synchrony/mongo'
++require 'em-synchrony/mongo'
+ require 'mongo'
+ 
+ describe Mongo::Connection do
+--- a/spec/helper/core.rb
++++ b/spec/helper/core.rb
+@@ -2,5 +2,5 @@ require 'rubygems'
+ require 'rspec'
+ require 'pp'
+ 
+-require 'lib/em-synchrony'
+-require 'lib/em-synchrony/em-http'
++require 'em-synchrony'
++require 'em-synchrony/em-http'
diff --git a/debian/patches/series b/debian/patches/series
index 14d56d0..d80753e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+remove-relative-require-from-tests.patch
 fix-tests-with-new-rspec-syntax.patch
 disable-hiredis-tests.patch
 disable-amqp.patch
diff --git a/debian/start_services_and_auto_install.sh b/debian/start_services_and_auto_install.sh
index 834f109..d895fdd 100755
--- a/debian/start_services_and_auto_install.sh
+++ b/debian/start_services_and_auto_install.sh
@@ -57,8 +57,9 @@ mysql --socket=${MYSQL_UNIX_PORT} --execute "drop database widgets;"
 rm -rf ${MYTEMP_DIR}
 
 # Stop memcached and cleanup pid file
-kill -9 `cat /tmp/memcached.pid`
-rm /tmp/memcached.pid
+#kill -9 `cat /tmp/memcached.pid`
+#rm /tmp/memcached.pid
+pkill memcached
 
 # Stop redis server
 pkill redis-server

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