diff options
author | Martin Pitt <martinpitt@gnome.org> | 2013-03-04 14:35:02 +0100 |
---|---|---|
committer | Martin Pitt <martinpitt@gnome.org> | 2013-03-04 14:41:52 +0100 |
commit | dd60eff6aa292c1980108c2a98038d0684e427f7 (patch) | |
tree | 8a3fb6d57dabd79fb53cee9dc530a052b6498310 | |
parent | 42d87f697f878e5e3c14bbef25992464f798d123 (diff) |
integration-test: Update for mkntfs
udisksd calls mkntfs now instead of mkfs.ntfs. Update integration-test
correspondingly.
-rwxr-xr-x | src/tests/integration-test | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tests/integration-test b/src/tests/integration-test index aded71b..be631f7 100755 --- a/src/tests/integration-test +++ b/src/tests/integration-test @@ -300,6 +300,7 @@ class UDisksTestCase(unittest.TestCase): stdout=subprocess.PIPE) mkcmd = { 'swap': 'mkswap', + 'ntfs': 'mkntfs', } label_opt = { 'vfat': '-n', 'reiserfs': '-l', @@ -794,10 +795,14 @@ class FS(UDisksTestCase): def _do_fs_check(self, type): '''Run checks for a particular file system.''' + if type == 'ntfs': + mkfs = 'mkntfs' + else: + mkfs = 'mkfs.' + type - if type != 'swap' and subprocess.call(['which', 'mkfs.' + type], + if type != 'swap' and subprocess.call(['which', mkfs], stdout=subprocess.PIPE) != 0: - sys.stderr.write('[no mkfs.%s, skip] ' % type) + sys.stderr.write('[no %s, skip] ' % mkfs) # check correct D-Bus exception try: |