Currently,FsOptions has changed the filesystem to fstype in partition,but in fsdev_disks it does not change yet. Now to change the filesystem to fstype to make the test work.
Signed-off-by: Mike Qiu <[email protected]> --- client/fsdev_disks.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/fsdev_disks.py b/client/fsdev_disks.py index 4a8b190..9386752 100644 --- a/client/fsdev_disks.py +++ b/client/fsdev_disks.py @@ -266,8 +266,8 @@ def prepare_disks(job, fs_desc, disk1_only=False, disk_list=None): disk_list = get_disk_list() # Make sure we have the appropriate 'mkfs' binary for the file system - mkfs_bin = 'mkfs.' + fs_desc.filesystem - if fs_desc.filesystem == 'ext4': + mkfs_bin = 'mkfs.' + fs_desc.fstype + if fs_desc.fstype == 'ext4': mkfs_bin = 'mkfs.ext4dev' try: @@ -278,10 +278,10 @@ def prepare_disks(job, fs_desc, disk1_only=False, disk_list=None): utils.system('cp -ufp %s /sbin' % mkfs_bin) except Exception: raise error.TestError('No mkfs binary available for ' + - fs_desc.filesystem) + fs_desc.fstype) # For 'ext4' we need to add '-E test_fs' to the mkfs options - if fs_desc.filesystem == 'ext4': + if fs_desc.fstype == 'ext4': fs_desc.mkfs_flags += ' -E test_fs' # If the caller only needs one drive, grab the first one only @@ -289,7 +289,7 @@ def prepare_disks(job, fs_desc, disk1_only=False, disk_list=None): disk_list = disk_list[0:1] # We have all the info we need to format the drives - mkfs_all_disks(job, disk_list, fs_desc.filesystem, + mkfs_all_disks(job, disk_list, fs_desc.fstype, fs_desc.mkfs_flags, fs_desc.mount_options) # Return(mount path of the first disk, test tag value, disk_list) -- 1.7.7.6 _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
