[Debian-ha-commits] [booth] 02/09: d/tests: run upstream unit tests (Closes: #888730)

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository booth.

commit a33162520b1fe13df75892a7343d73fbfd527755
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Mon Jan 29 21:00:10 2018 +0100

    d/tests: run upstream unit tests (Closes: #888730)
---
 debian/control        | 3 ---
 debian/rules          | 3 +++
 debian/tests/control  | 3 +++
 debian/tests/runtests | 9 +++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 8fc3894..745f94b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>,
  Valentin Vidic <Valentin.Vidic at CARNet.hr>
 Build-Depends:
  asciidoc,
- cluster-glue,
  cluster-glue-dev,
  debhelper (>= 11),
  docbook-xml,
@@ -18,8 +17,6 @@ Build-Depends:
  libxml2-dev,
  libxml2-utils,
  pkg-config,
- psmisc,
- python,
  xsltproc,
 Standards-Version: 4.1.3
 Homepage: https://github.com/ClusterLabs/booth
diff --git a/debian/rules b/debian/rules
index 6eb616b..d3538cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,9 @@ override_dh_install:
 override_dh_missing:
 	dh_missing --fail-missing
 
+# upstream tests fail on some architectures, run them from debian/tests
+override_dh_auto_test:
+
 # 1) booth should be started through pacemaker. So, neither enable nor
 #    start the service.
 # 2) booth-arbitrator should be enabled manually to not conflict with
diff --git a/debian/tests/control b/debian/tests/control
index 92966cd..a3ce3c5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -5,3 +5,6 @@ Tests: boothd
 Depends: booth-pacemaker, crmsh
 Restrictions: needs-root, isolation-container
 Tests: pacemaker
+
+Depends: booth, python, cluster-glue, psmisc, net-tools, perl
+Tests: runtests
diff --git a/debian/tests/runtests b/debian/tests/runtests
new file mode 100755
index 0000000..c02d55f
--- /dev/null
+++ b/debian/tests/runtests
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+# use boothd binary from the package
+sed -i "s|boothd_path *=.*|boothd_path = '/usr/sbin/boothd'|" test/boothtestenv.py
+
+# run tests
+python test/runtests.py 2>&1

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