[DRE-commits] [chef] 01/07: remove debian/patches/initscript-process-name

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository chef.

commit 8dc24ad0b927461025906fc23744e32654206986
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Mar 24 21:39:55 2015 -0300

    remove debian/patches/initscript-process-name
---
 debian/changelog                       |  9 +++++++++
 debian/patches/initscript-process-name | 16 ----------------
 debian/patches/series                  |  1 -
 debian/tests/control                   |  4 ++++
 debian/tests/init                      | 10 ++++++++++
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d58ac8b..77e9092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+chef (11.12.8-2) unstable; urgency=medium
+
+  * debian/patches/initscript-process-name: removed since chef has been fixed
+    to set the right process name. This fixes the initscript to actually be
+    able to stop the service.
+  * debian/tests: add test for the start and stop actions of the initscript
+
+ -- Antonio Terceiro <terceiro at debian.org>  Tue, 24 Mar 2015 21:52:44 -0300
+
 chef (11.12.8-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/initscript-process-name b/debian/patches/initscript-process-name
deleted file mode 100644
index ee7fd37..0000000
--- a/debian/patches/initscript-process-name
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: The process name will be ruby, not chef-client
-Bug-Debian: http://bugs.debian.org/677827
-Author: Eric Blevins <eblevins at kmionline.com>
-Last-Updated: 2014-01-10
-
---- a/distro/debian/etc/init.d/chef-client
-+++ b/distro/debian/etc/init.d/chef-client
-@@ -49,7 +49,7 @@
- running() {
-   [ ! -f "$PIDFILE" ] && return 1
-   pid=`cat $PIDFILE`
--  running_pid $pid $NAME || return 1
-+  running_pid $pid ruby || return 1
-   return 0
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 54eba6c..0a49035 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 remove_rubygems.diff
-initscript-process-name
diff --git a/debian/tests/control b/debian/tests/control
index 9f6de75..406db76 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,7 @@
 Tests: smoke-test
 Depends: @, shunit2
 Restrictions: needs-root
+
+Tests: init
+Depends: @, shunit2
+Restrictions: needs-root, isolation-container
diff --git a/debian/tests/init b/debian/tests/init
new file mode 100755
index 0000000..5d173d1
--- /dev/null
+++ b/debian/tests/init
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+test_initscript_starts_stops() {
+  service chef-client stop
+  assertFalse 'pgrep -fa chef-client'
+  service chef-client start
+  assertTrue 'pgrep -fa chef-client'
+}
+
+. shunit2

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