[Debian-ha-maintainers] Bug#883524: crmsh: autopkgtest portability fixes

[Steve Langasek]

Package: crmsh
Version: 3.0.1-2
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch autopkgtest

Dear maintainers,

The newest version of the crmsh introduces several new autopkgtests, which
is great; but these tests were failing in Ubuntu for a couple of reasons.

 - One of the new tests tries to purge the less package with dpkg --purge.
   This works fine in a default Debian CI environment, but in Ubuntu, less
   is a dependency of the ubuntu-minimal metapackage which is installed by
   default - so dpkg --purge fails.
 - Another test adds a test dependency on dmidecode.  This works fine on
   architectures where dmidecode exists; but Ubuntu runs autopkgtests on
   all its architectures, and dmidecode does not exist on ppc64el or s390x.

The attached patch addresses both of these issues, and lets the crmsh
autopkgtests pass on all Ubuntu architectures.  I believe the patch is also
suitable for inclusion in Debian.

Thanks for considering,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru crmsh-3.0.1/debian/tests/control crmsh-3.0.1/debian/tests/control
--- crmsh-3.0.1/debian/tests/control	2017-09-01 06:10:52.000000000 -0700
+++ crmsh-3.0.1/debian/tests/control	2017-12-03 22:44:50.000000000 -0800
@@ -23,5 +23,5 @@
 Restrictions: needs-root, allow-stderr, isolation-container
 
 Tests: pacemaker-cluster-init.sh
-Depends: @, pacemaker, corosync, csync2, ntp, ufw, openssh-server, dmidecode, booth, booth-pacemaker
+Depends: @, pacemaker, corosync, csync2, ntp, ufw, openssh-server, dmidecode [any-amd64 arm64 armhf any-i386], booth, booth-pacemaker
 Restrictions: needs-root, allow-stderr, isolation-container
diff -Nru crmsh-3.0.1/debian/tests/utils.sh crmsh-3.0.1/debian/tests/utils.sh
--- crmsh-3.0.1/debian/tests/utils.sh	2017-06-08 02:32:07.000000000 -0700
+++ crmsh-3.0.1/debian/tests/utils.sh	2017-12-03 22:42:26.000000000 -0800
@@ -3,7 +3,7 @@
 set -ex
 
 export LC_ALL=C
-PKG=less
+PKG=vim
 
 dpkg --purge $PKG