Skip to content
Snippets Groups Projects
Commit cd2a2b84 authored by Jeremy Bicha's avatar Jeremy Bicha
Browse files

Import Debian changes 2.8.1-4

udisks2 (2.8.1-4) unstable; urgency=medium

  * Cherry-pick commit to fix test race condition detected by Ubuntu ppc64el
parent cd7e6d2f
Branches debian/buster
Tags debian/2.8.1-4
3 merge requests!13Merge changes from apertis/v2019-updates into apertis/v2019,!5Backport crypto, mdraid and part plugins removal to v2019,!1Merge 2.8.1 4
Pipeline #209111 passed
udisks2 (2.8.1-4) unstable; urgency=medium
* Cherry-pick commit to fix test race condition detected by Ubuntu ppc64el
-- Jeremy Bicha <jbicha@debian.org> Thu, 21 Feb 2019 20:48:01 -0500
udisks2 (2.8.1-3) unstable; urgency=medium
* Move D-Bus policy file to /usr/share/dbus-1/system.d/
......
From: Iain Lane <iainl@gnome.org>
Date: Fri, 15 Feb 2019 11:48:05 +0000
Subject: integration-test: Sync after creating our fake devices
On Ubuntu ppc64el, the integration tests are almost always failing like
this:
Traceback (most recent call last):
File "src/tests/integration-test", line 1788, in test_md_raid_methods
self.assertNotProperty(block_interface, 'mdraid-member', '/')
File "src/tests/integration-test", line 542, in assertNotProperty
self.assertNotEqual(obj.get_property(name), value)
AssertionError: '/' == '/'
Upon investigation, it turns out that this is due to a race condition in
the tests - when we use targetcli to create the devices, they are not
seen by udev immediately, and consequently are not visible to udisks
either. If an array is created in this period, this causes the
MDRaidMember property to not be set. We can fix this problem by calling
`sync()` before running any tests, to ensure that our devices are fully
visible - as they would be if they were real devices.
---
src/tests/integration-test | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/tests/integration-test b/src/tests/integration-test
index 520b72a..eb6225f 100755
--- a/src/tests/integration-test
+++ b/src/tests/integration-test
@@ -1816,6 +1816,7 @@ class MDRaid(UDisksTestCase):
@classmethod
def setUpClass(cls):
cls.devices = setup_lio()
+ cls.sync()
@classmethod
def tearDownClass(cls):
Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch
integration-test-Sync-after-creating-our-fake-devices.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment