summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2012-06-07 10:43:23 +0200
committerMartin Pitt <martinpitt@gnome.org>2012-06-07 11:42:09 +0200
commit6d51ed1055763d82f7945d60de4b91ca69d87873 (patch)
tree29b22ee84716a889195730db0630f5dffe632db7
parentd12166cf7b806b6e2079c33122e66806085b3013 (diff)
integration-test: Update expected Luks mount points
Mounts are now done in /run/media when there is a known user name. Update the Luks tests to get along with both /media and /run/media/user.
-rwxr-xr-xsrc/tests/integration-test11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tests/integration-test b/src/tests/integration-test
index 8e88af1..a0f88b4 100755
--- a/src/tests/integration-test
+++ b/src/tests/integration-test
@@ -1032,10 +1032,11 @@ class Luks(UDisksTestCase):
mount_path = fs.call_mount_sync(no_options, None)
try:
- self.assertEqual(mount_path, '/media/treasure')
+ self.assertTrue('/media/' in mount_path)
+ self.assertTrue(mount_path.endswith('treasure'))
self.assertTrue(self.is_mountpoint(mount_path))
self.client.settle()
- self.assertEqual(fs.get_property('mount-points'), ['/media/treasure'])
+ self.assertEqual(fs.get_property('mount-points'), [mount_path])
# can't lock, busy
try:
@@ -1065,7 +1066,8 @@ class Luks(UDisksTestCase):
try:
fs = self.client.get_object(path).get_property('filesystem')
mount_path = fs.call_mount_sync(no_options, None)
- self.assertEqual(mount_path, '/media/treasure')
+ self.assertTrue('/media/' in mount_path)
+ self.assertTrue(mount_path.endswith('treasure'))
# removal should clean up mounts
self.remove_device(self.device)
@@ -1080,7 +1082,8 @@ class Luks(UDisksTestCase):
self.client.settle()
fs = self.client.get_object(path).get_property('filesystem')
mount_path = fs.call_mount_sync(no_options, None)
- self.assertEqual(mount_path, '/media/treasure')
+ self.assertTrue('/media/' in mount_path)
+ self.assertTrue(mount_path.endswith('treasure'))
# umount
self.retry_busy(fs.call_unmount_sync, no_options, None)