[Debian-ha-commits] [crmsh] 01/01: debian/tests/utils.sh: Make test more robust against environment changes.

[Christoph Berg]

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

myon pushed a commit to branch master
in repository crmsh.

commit 3434884d9db683fcb1599f57b8399c76ac7905b7
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Wed Jun 7 13:17:12 2017 +0200

    debian/tests/utils.sh: Make test more robust against environment changes.
---
 debian/changelog      | 6 ++++++
 debian/tests/utils.sh | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b998280..018e7f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+crmsh (2.3.2-5) UNRELEASED; urgency=medium
+
+  * debian/tests/utils.sh: Make test more robust against environment changes.
+
+ -- Christoph Berg <christoph.berg at credativ.de>  Wed, 07 Jun 2017 12:31:52 +0200
+
 crmsh (2.3.2-4) unstable; urgency=medium
 
   * Remove uninstall file list
diff --git a/debian/tests/utils.sh b/debian/tests/utils.sh
old mode 100644
new mode 100755
index 038ed19..e23c0e6
--- a/debian/tests/utils.sh
+++ b/debian/tests/utils.sh
@@ -2,8 +2,11 @@
 
 set -ex
 
+export LC_ALL=C
 PKG=less
 
+dpkg --purge $PKG
+
 # package not installed
 /usr/share/crmsh/utils/crm_rpmcheck.py $PKG | grep error
 
@@ -16,7 +19,7 @@ dpkg --status $PKG
 /usr/share/crmsh/utils/crm_pkg.py -n $PKG -s latest | grep false
 
 # purge
-/usr/share/crmsh/utils/crm_pkg.py -n $PKG -s removed | grep Purging
+/usr/share/crmsh/utils/crm_pkg.py -n $PKG -s removed | egrep 'Removing|Purging'
 /usr/share/crmsh/utils/crm_rpmcheck.py $PKG | grep error
 
 # clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/crmsh.git