Merge ~athos-ribeiro/ubuntu/+source/nut:skip-flaky-tests into ubuntu/+source/nut:ubuntu/devel

[Athos Ribeiro]

This is a temporary fix for LP: #1998481. The mentioned bug points to an upstream bug where sd_notify support is being implemented. When that is complete, we can apply the patch attached to that bug to the nut package. Until then, Let's skip these flaky tests to avoid blocking other package migrations.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/nut-flaky-tests/+packages

Local test run result summary:

autopkgtest [11:22:15]: test nut: [-----------------------
test_CVE_2012_2944 (__main__.BasicTest)
Test CVE-2012-2944 ... ok
test_daemons_pid (__main__.BasicTest)
Test daemons using PID files ... ok
test_daemons_service (__main__.BasicTest)
Test daemons using "service status" ... ok
test_upsc_device_list (__main__.BasicTest)
Test NUT client interface (upsc): device(s) listing ... ok
test_upsd_IPv4 (__main__.BasicTest)
Test upsd IPv4 reachability ... ok
test_upsd_IPv6 (__main__.BasicTest)
Test upsd IPv6 reachability ... ok
test_upsmon_notif (__main__.BasicTest)
Test upsmon notifications ... skipped 'Skip flaky test. See LP: #1998481 for further reference.'
test_upsrw (__main__.BasicTest)
Test upsrw ... skipped 'Skip flaky test. See LP: #1998481 for further reference.'

----------------------------------------------------------------------
Ran 8 tests in 118.815s

OK (skipped=2)
Skipping private tests
autopkgtest [11:24:15]: test nut: -----------------------]
autopkgtest [11:24:15]: test nut: - - - - - - - - - - results - - - - - - - - - -
nut PASS
autopkgtest [11:24:16]: @@@@@@@@@@@@@@@@@@@@ summary
nut PASS

[Bryce Harrington (bryce)]

LGTM, thanks for including the LP#'s for the skips.

I triggered autopkgtests against the PPA:

$ ppa tests ppa:athos-ribeiro/nut-flaky-tests
* Triggers:
  - Source nut/2.8.0-6ubuntu1~ppa1: Published
    + Trigger basic @amd64♻️ Trigger all-proposed @amd64💍
    + Trigger basic @arm64♻️ Trigger all-proposed @arm64💍
    + Trigger basic @armhf♻️ Trigger all-proposed @armhf💍
    + Trigger basic @i386♻️ Trigger all-proposed @i386💍
    + Trigger basic @ppc64el♻️ Trigger all-proposed @ppc64el💍
    + Trigger basic @s390x♻️ Trigger all-proposed @s390x💍

* Results:
* Running:
  # time pkg release arch ppa trigger
  - 20 nut lunar ppc64el athos-ribeiro/nut-flaky-tests nut/2.8.0-6ubuntu1~ppa1
  - 20 nut lunar armhf athos-ribeiro/nut-flaky-tests nut/2.8.0-6ubuntu1~ppa1
  - 20 nut lunar arm64 athos-ribeiro/nut-flaky-tests nut/2.8.0-6ubuntu1~ppa1
* Waiting:
  # Q-num pkg release arch ppa trigger
  - 1 nut lunar s390x athos-ribeiro/nut-flaky-tests nut/2.8.0-6ubuntu1~ppa1
  - 1 nut lunar amd64 athos-ribeiro/nut-flaky-tests nut/2.8.0-6ubuntu1~ppa1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce!

Uploaded

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nut_2.8.0-6ubuntu1.dsc: done.
  Uploading nut_2.8.0-6ubuntu1.debian.tar.xz: done.
  Uploading nut_2.8.0-6ubuntu1_source.buildinfo: done.
  Uploading nut_2.8.0-6ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index ac49687..d48b6ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nut (2.8.0-6ubuntu1) lunar; urgency=medium
+
+  * Skip flaky tests. (LP: #1998481)
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 05 Jan 2023 10:23:48 -0300
+
 nut (2.8.0-6) unstable; urgency=medium
 
   * debian/patches/appdata-launchable.patch: Add launchable tag
diff --git a/debian/control b/debian/control
index c1c0b10..3577e16 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nut
 Section: admin
 Priority: optional
-Maintainer: Laurent Bigonville <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Laurent Bigonville <[e-mail]>
 Build-Depends: asciidoc <!nodoc>,
                debhelper (>= 12),
                dh-python,
diff --git a/debian/tests/test-nut.py b/debian/tests/test-nut.py
index 3197c14..32e43df 100644
--- a/debian/tests/test-nut.py
+++ b/debian/tests/test-nut.py
@@ -338,6 +338,7 @@ class BasicTest(NutTestCommon, PrivateNutTest):
     # Result == Main ; dummy-dev1 ; $hostname
     #    self.assertTrue('dummy-dev1' in report, 'dummy-dev1 should be present in device(s) listing: ' + report)
 
+    @unittest.skip("Skip flaky test. See LP: #1998481 for further reference.")
     def test_upsrw(self):
         '''Test upsrw'''
         # Set ups.status to OB (On Battery)...
@@ -351,6 +352,7 @@ class BasicTest(NutTestCommon, PrivateNutTest):
     #def test_upscmd(self):
     #    '''Test upscmd'''
 
+    @unittest.skip("Skip flaky test. See LP: #1998481 for further reference.")
     def test_upsmon_notif(self):
         '''Test upsmon notifications'''
         # Set ups.status to OB (On Battery)...