[DRE-commits] [ruby-sidekiq] 06/07: remove patch, original file is removed

[Praveen Arimbrathodiyil]

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

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

commit 51e0cefc3b49f33afdacd943d6d279e7e3fcdc62
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jul 30 20:01:32 2015 +0530

    remove patch, original file is removed
---
 debian/changelog                                |  3 ++-
 debian/patches/series                           |  1 -
 debian/patches/skip-rails-generator-tests.patch | 18 ------------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e4c54f..a86f276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ ruby-sidekiq (3.4.2~dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump ruby-connection-pool dependency >= 2.1.1.
-  * Refresh patch.
+  * Refresh patches.
+  * Remove patch skip-rails-generator-tests.patch.
 
  -- Pirate Praveen <praveen at debian.org>  Sat, 02 May 2015 17:49:18 +0530
 
diff --git a/debian/patches/series b/debian/patches/series
index dcecf3f..a4b830f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 web-path-change.patch
 require-standard-cli.patch
-skip-rails-generator-tests.patch
diff --git a/debian/patches/skip-rails-generator-tests.patch b/debian/patches/skip-rails-generator-tests.patch
deleted file mode 100644
index fcf5a9e..0000000
--- a/debian/patches/skip-rails-generator-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: skip failing rails generator tests
- These are failing because path contains ~
-Forwarded: yes, https://github.com/mperham/sidekiq/issues/2065
-
-Index: ruby-sidekiq/test/test_worker_generator.rb
-===================================================================
---- ruby-sidekiq.orig/test/test_worker_generator.rb
-+++ ruby-sidekiq/test/test_worker_generator.rb
-@@ -11,7 +11,7 @@ class WorkerGeneratorTest < Rails::Gener
-   test "worker is created and its test" do
-     run_generator
- 
--    assert_file "app/workers/foo_worker.rb"
--    assert_file "test/workers/foo_worker_test.rb"
-+#    assert_file "app/workers/foo_worker.rb"
-+#    assert_file "test/workers/foo_worker_test.rb"
-   end
- end

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