integration-tests: Don't assume ordering in mount-points property

Make assertEventually() handle expected sets, and convert the actual value to a
set.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/tests/integration-test b/src/tests/integration-test
index fe4ee9f..89649f8 100755
--- a/src/tests/integration-test
+++ b/src/tests/integration-test
@@ -477,7 +477,10 @@ class UDisksTestCase(unittest.TestCase):
             time.sleep(0.1)
             self.sync()
 
-        self.assertEqual(fn(), value)
+        if isinstance(value, set):
+            self.assertEqual(set(fn()), value)
+        else:
+            self.assertEqual(fn(), value)
 
     def assertProperty(self, obj, name, value):
         '''Check that an object's property is eventually equal to value'''
@@ -889,7 +892,7 @@ class FS(UDisksTestCase):
         if type != 'ntfs':
             # ntfs-3g does not support multiple mounts
             subprocess.check_call([mount_prog, self.device, mount_b])
-            self.assertProperty(fs, 'mount-points', [mount_a, mount_b])
+            self.assertProperty(fs, 'mount-points', set([mount_a, mount_b]))
             subprocess.call(['umount', mount_b])
 
         # unmount it