diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2014-12-18 13:40:07 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2014-12-18 13:40:07 +0100 |
| commit | cf93824e79e02ff62f16eb0fab24d5574612e395 (patch) | |
| tree | 7469288a3c0933b0eee9db3d79b7b6b190d6ed9b | |
| parent | e5130928ae79f2b503b462aafe7a7870b9bcec59 (diff) | |
integration-test: Skip double mount check for NTFS
ntfs-3g does not support multiple mounts.
| -rwxr-xr-x | src/tests/integration-test | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/tests/integration-test b/src/tests/integration-test index e8a67b9..9ccd65a 100755 --- a/src/tests/integration-test +++ b/src/tests/integration-test @@ -884,12 +884,16 @@ class FS(UDisksTestCase): return self.assertEqual(ret, 0) - subprocess.check_call([mount_prog, self.device, mount_b]) + self.assertProperty(fs, 'mount-points', [mount_a]) - self.assertProperty(fs, 'mount-points', [mount_a, mount_b]) + 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]) + subprocess.call(['umount', mount_b]) # unmount it - subprocess.call(['umount', mount_a, mount_b]) + subprocess.call(['umount', mount_a]) self.assertProperty(fs, 'mount-points', []) def _do_udisks_check(self, type, label=None): |