[DRE-commits] [chef] 02/02: Blacklist mount_spec and ifconfig_spec, as they require real root.

[Stefano Rivera]

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

stefanor pushed a commit to branch master
in repository chef.

commit 9486263d7f01f3ae80a2b680afde20aedd14180b
Author: Stefano Rivera <stefanor at debian.org>
Date:   Tue Nov 15 15:12:16 2016 +0100

    Blacklist mount_spec and ifconfig_spec, as they require real root.
    
    * Blacklist mount_spec and ifconfig_spec, as they require real root.
    * Be more verbose on failure, and tighten the pgrep to avoid catching
      "systemd-cgroups-agent chef-client.service" after stopping.
      (Patch from Ubuntu)
---
 debian/changelog            | 4 ++++
 debian/ruby-tests.blacklist | 2 ++
 debian/tests/init           | 6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 094a642..1bd23b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ chef (12.14.60-3) UNRELEASED; urgency=medium
 
   * Build-Depend on ruby-fuzzyurl, rather than relying on it's indirect
     presence via ohai -> ruby-chef-config.
+  * Blacklist mount_spec and ifconfig_spec, as they require real root.
+  * Be more verbose on failure, and tighten the pgrep to avoid catching
+    "systemd-cgroups-agent chef-client.service" after stopping.
+    (Patch from Ubuntu)
 
  -- Stefano Rivera <stefanor at debian.org>  Tue, 15 Nov 2016 12:04:08 +0100
 
diff --git a/debian/ruby-tests.blacklist b/debian/ruby-tests.blacklist
index 8b8c19c..9f184ef 100644
--- a/debian/ruby-tests.blacklist
+++ b/debian/ruby-tests.blacklist
@@ -9,7 +9,9 @@ spec/functional/resource/deploy_revision_spec.rb
 spec/functional/resource/dpkg_package_spec.rb
 spec/functional/resource/git_spec.rb
 spec/functional/resource/group_spec.rb
+spec/functional/resource/ifconfig_spec.rb
 spec/functional/resource/link_spec.rb
+spec/functional/resource/mount_spec.rb
 spec/functional/resource/package_spec.rb
 spec/functional/resource/remote_directory_spec.rb
 spec/functional/resource/remote_file_spec.rb
diff --git a/debian/tests/init b/debian/tests/init
index 5d173d1..0ba3df2 100755
--- a/debian/tests/init
+++ b/debian/tests/init
@@ -2,9 +2,11 @@
 
 test_initscript_starts_stops() {
   service chef-client stop
-  assertFalse 'pgrep -fa chef-client'
+  if ps=$(pgrep -fa bin/chef-client); then
+    fail "chef-client still running after stop: $ps"
+  fi
   service chef-client start
-  assertTrue 'pgrep -fa chef-client'
+  assertTrue 'chef-client not running after start' 'pgrep -fa bin/chef-client'
 }
 
 . shunit2

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