Control: tags -1 + patch Am 26.01.20 um 18:37 schrieb Michael Biebl:
> munin currently runs a test suite for both systemd and sysvinit. > It uses the same name though, making it unnecessarily hard to decipher > the results like in > > autopkgtest [07:48:54]: test command1: - - - - - - - - - - results - - - - - > - - - - - > command1 PASS > autopkgtest [07:48:54]: @@@@@@@@@@@@@@@@@@@@ summary > master-cron PASS > master-cgi PASS > master-cron FAIL non-zero exit status 1 > master-cgi PASS > node PASS > node FAIL timed out > command1 PASS > > > > I think you have two options > > Symlink the tests: > > $ cd debian/tests && ln -s master-cron master-cron-sysv > > Tests: master-cron-sysv > > Use the test-name feature > > Tests: master-cron > Features: test-name=master-cron-sysv > > Both approaches have their pros and cons. I have attached a patch for the symlink based approach (as it was the simpler one). Regards,
From 8ad5f31e42d1896977ebae59a18f1d6928b8e094 Mon Sep 17 00:00:00 2001 From: Michael Biebl <bi...@debian.org> Date: Sun, 26 Jan 2020 19:34:34 +0100 Subject: [PATCH] Run sysvinit based tests under a different name Closes: #949889 --- debian/tests/control | 4 ++-- debian/tests/master-cgi-sysv | 1 + debian/tests/master-cron-sysv | 1 + debian/tests/node-sysv | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) create mode 120000 debian/tests/master-cgi-sysv create mode 120000 debian/tests/master-cron-sysv create mode 120000 debian/tests/node-sysv diff --git a/debian/tests/control b/debian/tests/control index f130827c..02439326 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -29,7 +29,7 @@ Depends: munin, munin-node, daemontools, apache2, curl, file, libcgi-fast-perl, Restrictions: needs-root, breaks-testbed, isolation-container # sysvinit-core -Tests: master-cron, master-cgi +Tests: master-cron-sysv, master-cgi-sysv Depends: munin, munin-node, daemontools, apache2, curl, file, libcgi-fast-perl, sharness, sysvinit-core, cron Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable @@ -48,7 +48,7 @@ Depends: munin-node, netcat-openbsd, sharness, systemd-sysv Restrictions: needs-root, breaks-testbed, isolation-container # sysvinit-core -Tests: node +Tests: node-sysv Depends: munin-node, netcat-openbsd, sharness, sysvinit-core, cron Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable diff --git a/debian/tests/master-cgi-sysv b/debian/tests/master-cgi-sysv new file mode 120000 index 00000000..e8be5cae --- /dev/null +++ b/debian/tests/master-cgi-sysv @@ -0,0 +1 @@ +master-cgi \ No newline at end of file diff --git a/debian/tests/master-cron-sysv b/debian/tests/master-cron-sysv new file mode 120000 index 00000000..1b7967a1 --- /dev/null +++ b/debian/tests/master-cron-sysv @@ -0,0 +1 @@ +master-cron \ No newline at end of file diff --git a/debian/tests/node-sysv b/debian/tests/node-sysv new file mode 120000 index 00000000..32b6e495 --- /dev/null +++ b/debian/tests/node-sysv @@ -0,0 +1 @@ +node \ No newline at end of file -- 2.25.0
signature.asc
Description: OpenPGP digital signature
