diff options
author | Martin Pitt <martinpitt@gnome.org> | 2012-06-01 07:15:27 +0200 |
---|---|---|
committer | Martin Pitt <martinpitt@gnome.org> | 2012-06-01 07:19:35 +0200 |
commit | 671a1d5da38b51f90c7c69b34cd05d094a9b3552 (patch) | |
tree | ff2bbc6ae999c78c03aa88b8feb16f790e90e0e7 | |
parent | 3168b2bf0f212bf6a27a6d3ba22167ab21c7878e (diff) |
integration tests: Update expected mount points
mounts are now done in /run/media when there is a known user name. Update the
tests to get along with both /media and /run/media/user.
-rwxr-xr-x | src/tests/integration-test | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/tests/integration-test b/src/tests/integration-test index 328693d..f03380a 100755 --- a/src/tests/integration-test +++ b/src/tests/integration-test @@ -634,8 +634,9 @@ class FS(UDisksTestCase): self.mkfs('ext4', 'udiskstest') fs = self.udisks_filesystem() mount_path = fs.call_mount_sync(no_options, None) - self.assertEqual(mount_path, '/media/udiskstest') - self.assertTrue(self.is_mountpoint('/media/udiskstest')) + self.assertTrue(mount_path.endswith('udiskstest')) + self.assertTrue('/media/' in mount_path) + self.assertTrue(self.is_mountpoint(mount_path)) dev_t = os.stat(self.devname()).st_rdev @@ -650,10 +651,11 @@ class FS(UDisksTestCase): self.assertEqual(fs.get_property('mount-points'), []) mount_path = fs.call_mount_sync(no_options, None) - self.assertTrue(self.is_mountpoint('/media/udiskstest')) - self.assertEqual(mount_path, '/media/udiskstest') + self.assertTrue(mount_path.endswith('udiskstest')) + self.assertTrue('/media/' in mount_path) + self.assertTrue(self.is_mountpoint(mount_path)) self.client.settle() - self.assertEqual(fs.get_property('mount-points'), ['/media/udiskstest']) + self.assertEqual(fs.get_property('mount-points'), [mount_path]) self.retry_busy(fs.call_unmount_sync, no_options, None) self.client.settle() @@ -784,10 +786,9 @@ class FS(UDisksTestCase): # mount mount_path = fs.call_mount_sync(no_options, None) + self.assertTrue(mount_path.startswith('/run/media/'), mount_path) if label: - self.assertEqual(mount_path, '/media/' + label) - else: - self.assertTrue(mount_path.startswith('/media/')) + self.assertTrue(mount_path.endswith(label)) self.client.settle() self.assertEqual(fs.get_property('mount-points'), [mount_path]) |