2018-09-11 06:59:19 +00:00
|
|
|
# SPDX-License-Identifier: GPL-2.0+
|
|
|
|
# Copyright (c) 2018, Linaro Limited
|
|
|
|
# Author: Takahiro Akashi <takahiro.akashi@linaro.org>
|
|
|
|
|
|
|
|
import os
|
|
|
|
import os.path
|
|
|
|
import pytest
|
|
|
|
import re
|
|
|
|
from subprocess import call, check_call, check_output, CalledProcessError
|
|
|
|
from fstest_defs import *
|
|
|
|
|
|
|
|
supported_fs_basic = ['fat16', 'fat32', 'ext4']
|
2018-09-11 06:59:20 +00:00
|
|
|
supported_fs_ext = ['fat16', 'fat32']
|
2018-09-11 06:59:21 +00:00
|
|
|
supported_fs_mkdir = ['fat16', 'fat32']
|
2018-09-11 07:06:03 +00:00
|
|
|
supported_fs_unlink = ['fat16', 'fat32']
|
2019-02-13 11:15:27 +00:00
|
|
|
supported_fs_symlink = ['ext4']
|
2018-09-11 06:59:19 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Filesystem test specific setup
|
|
|
|
#
|
|
|
|
def pytest_addoption(parser):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Enable --fs-type option.
|
|
|
|
|
|
|
|
See pytest_configure() about how it works.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
parser: Pytest command-line parser.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
parser.addoption('--fs-type', action='append', default=None,
|
|
|
|
help='Targeting Filesystem Types')
|
|
|
|
|
|
|
|
def pytest_configure(config):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Restrict a file system(s) to be tested.
|
|
|
|
|
|
|
|
A file system explicitly named with --fs-type option is selected
|
|
|
|
if it belongs to a default supported_fs_xxx list.
|
|
|
|
Multiple options can be specified.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
config: Pytest configuration.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
global supported_fs_basic
|
2018-09-11 06:59:20 +00:00
|
|
|
global supported_fs_ext
|
2018-09-11 06:59:21 +00:00
|
|
|
global supported_fs_mkdir
|
2018-09-11 07:06:03 +00:00
|
|
|
global supported_fs_unlink
|
2019-02-13 11:15:27 +00:00
|
|
|
global supported_fs_symlink
|
2018-09-11 06:59:19 +00:00
|
|
|
|
|
|
|
def intersect(listA, listB):
|
|
|
|
return [x for x in listA if x in listB]
|
|
|
|
|
|
|
|
supported_fs = config.getoption('fs_type')
|
|
|
|
if supported_fs:
|
2018-12-27 15:11:13 +00:00
|
|
|
print('*** FS TYPE modified: %s' % supported_fs)
|
2018-09-11 06:59:19 +00:00
|
|
|
supported_fs_basic = intersect(supported_fs, supported_fs_basic)
|
2018-09-11 06:59:20 +00:00
|
|
|
supported_fs_ext = intersect(supported_fs, supported_fs_ext)
|
2018-09-11 06:59:21 +00:00
|
|
|
supported_fs_mkdir = intersect(supported_fs, supported_fs_mkdir)
|
2018-09-11 07:06:03 +00:00
|
|
|
supported_fs_unlink = intersect(supported_fs, supported_fs_unlink)
|
2019-02-13 11:15:27 +00:00
|
|
|
supported_fs_symlink = intersect(supported_fs, supported_fs_symlink)
|
2018-09-11 06:59:19 +00:00
|
|
|
|
|
|
|
def pytest_generate_tests(metafunc):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Parametrize fixtures, fs_obj_xxx
|
|
|
|
|
|
|
|
Each fixture will be parametrized with a corresponding support_fs_xxx
|
|
|
|
list.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
metafunc: Pytest test function.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
if 'fs_obj_basic' in metafunc.fixturenames:
|
|
|
|
metafunc.parametrize('fs_obj_basic', supported_fs_basic,
|
|
|
|
indirect=True, scope='module')
|
2018-09-11 06:59:20 +00:00
|
|
|
if 'fs_obj_ext' in metafunc.fixturenames:
|
|
|
|
metafunc.parametrize('fs_obj_ext', supported_fs_ext,
|
|
|
|
indirect=True, scope='module')
|
2018-09-11 06:59:21 +00:00
|
|
|
if 'fs_obj_mkdir' in metafunc.fixturenames:
|
|
|
|
metafunc.parametrize('fs_obj_mkdir', supported_fs_mkdir,
|
|
|
|
indirect=True, scope='module')
|
2018-09-11 07:06:03 +00:00
|
|
|
if 'fs_obj_unlink' in metafunc.fixturenames:
|
|
|
|
metafunc.parametrize('fs_obj_unlink', supported_fs_unlink,
|
|
|
|
indirect=True, scope='module')
|
2019-02-13 11:15:27 +00:00
|
|
|
if 'fs_obj_symlink' in metafunc.fixturenames:
|
|
|
|
metafunc.parametrize('fs_obj_symlink', supported_fs_symlink,
|
|
|
|
indirect=True, scope='module')
|
2018-09-11 06:59:19 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Helper functions
|
|
|
|
#
|
|
|
|
def fstype_to_ubname(fs_type):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Convert a file system type to an U-boot specific string
|
|
|
|
|
|
|
|
A generated string can be used as part of file system related commands
|
|
|
|
or a config name in u-boot. Currently fat16 and fat32 are handled
|
|
|
|
specifically.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
fs_type: File system type.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
A corresponding string for file system type.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
if re.match('fat', fs_type):
|
|
|
|
return 'fat'
|
|
|
|
else:
|
|
|
|
return fs_type
|
|
|
|
|
|
|
|
def check_ubconfig(config, fs_type):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Check whether a file system is enabled in u-boot configuration.
|
|
|
|
|
|
|
|
This function is assumed to be called in a fixture function so that
|
|
|
|
the whole test cases will be skipped if a given file system is not
|
|
|
|
enabled.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
fs_type: File system type.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
Nothing.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
if not config.buildconfig.get('config_cmd_%s' % fs_type, None):
|
|
|
|
pytest.skip('.config feature "CMD_%s" not enabled' % fs_type.upper())
|
|
|
|
if not config.buildconfig.get('config_%s_write' % fs_type, None):
|
|
|
|
pytest.skip('.config feature "%s_WRITE" not enabled'
|
|
|
|
% fs_type.upper())
|
|
|
|
|
|
|
|
def mk_fs(config, fs_type, size, id):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Create a file system volume.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
fs_type: File system type.
|
|
|
|
size: Size of file system in MiB.
|
|
|
|
id: Prefix string of volume's file name.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
Nothing.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
fs_img = '%s.%s.img' % (id, fs_type)
|
|
|
|
fs_img = config.persistent_data_dir + '/' + fs_img
|
|
|
|
|
|
|
|
if fs_type == 'fat16':
|
|
|
|
mkfs_opt = '-F 16'
|
|
|
|
elif fs_type == 'fat32':
|
|
|
|
mkfs_opt = '-F 32'
|
|
|
|
else:
|
|
|
|
mkfs_opt = ''
|
|
|
|
|
|
|
|
if re.match('fat', fs_type):
|
|
|
|
fs_lnxtype = 'vfat'
|
|
|
|
else:
|
|
|
|
fs_lnxtype = fs_type
|
|
|
|
|
|
|
|
count = (size + 1048576 - 1) / 1048576
|
|
|
|
|
2021-06-10 15:08:42 +00:00
|
|
|
# Some distributions do not add /sbin to the default PATH, where mkfs lives
|
|
|
|
if '/sbin' not in os.environ["PATH"].split(os.pathsep):
|
|
|
|
os.environ["PATH"] += os.pathsep + '/sbin'
|
|
|
|
|
2018-09-11 06:59:19 +00:00
|
|
|
try:
|
|
|
|
check_call('rm -f %s' % fs_img, shell=True)
|
|
|
|
check_call('dd if=/dev/zero of=%s bs=1M count=%d'
|
|
|
|
% (fs_img, count), shell=True)
|
|
|
|
check_call('mkfs.%s %s %s'
|
|
|
|
% (fs_lnxtype, mkfs_opt, fs_img), shell=True)
|
2020-08-04 17:28:33 +00:00
|
|
|
if fs_type == 'ext4':
|
|
|
|
sb_content = check_output('tune2fs -l %s' % fs_img, shell=True).decode()
|
|
|
|
if 'metadata_csum' in sb_content:
|
|
|
|
check_call('tune2fs -O ^metadata_csum %s' % fs_img, shell=True)
|
2018-09-11 06:59:19 +00:00
|
|
|
return fs_img
|
|
|
|
except CalledProcessError:
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
|
|
|
raise
|
|
|
|
|
|
|
|
# from test/py/conftest.py
|
|
|
|
def tool_is_in_path(tool):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Check whether a given command is available on host.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
tool: Command name.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
True if available, False if not.
|
|
|
|
"""
|
2018-12-27 15:11:13 +00:00
|
|
|
for path in os.environ['PATH'].split(os.pathsep):
|
2018-09-11 06:59:19 +00:00
|
|
|
fn = os.path.join(path, tool)
|
|
|
|
if os.path.isfile(fn) and os.access(fn, os.X_OK):
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
fuse_mounted = False
|
|
|
|
|
|
|
|
def mount_fs(fs_type, device, mount_point):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Mount a volume.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
fs_type: File system type.
|
|
|
|
device: Volume's file name.
|
|
|
|
mount_point: Mount point.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
Nothing.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
global fuse_mounted
|
|
|
|
|
|
|
|
fuse_mounted = False
|
|
|
|
try:
|
|
|
|
if tool_is_in_path('guestmount'):
|
|
|
|
fuse_mounted = True
|
|
|
|
check_call('guestmount -a %s -m /dev/sda %s'
|
|
|
|
% (device, mount_point), shell=True)
|
|
|
|
else:
|
2018-12-27 15:11:13 +00:00
|
|
|
mount_opt = 'loop,rw'
|
2018-09-11 06:59:19 +00:00
|
|
|
if re.match('fat', fs_type):
|
2018-12-27 15:11:13 +00:00
|
|
|
mount_opt += ',umask=0000'
|
2018-09-11 06:59:19 +00:00
|
|
|
|
|
|
|
check_call('sudo mount -o %s %s %s'
|
|
|
|
% (mount_opt, device, mount_point), shell=True)
|
|
|
|
|
|
|
|
# may not be effective for some file systems
|
|
|
|
check_call('sudo chmod a+rw %s' % mount_point, shell=True)
|
|
|
|
except CalledProcessError:
|
|
|
|
raise
|
|
|
|
|
2018-09-27 07:07:22 +00:00
|
|
|
def umount_fs(mount_point):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Unmount a volume.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
mount_point: Mount point.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
Nothing.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
if fuse_mounted:
|
|
|
|
call('sync')
|
|
|
|
call('guestunmount %s' % mount_point, shell=True)
|
|
|
|
else:
|
|
|
|
call('sudo umount %s' % mount_point, shell=True)
|
|
|
|
|
|
|
|
#
|
|
|
|
# Fixture for basic fs test
|
|
|
|
# derived from test/fs/fs-test.sh
|
|
|
|
#
|
2021-01-28 19:39:56 +00:00
|
|
|
@pytest.fixture()
|
2018-09-11 06:59:19 +00:00
|
|
|
def fs_obj_basic(request, u_boot_config):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Set up a file system to be used in basic fs test.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
request: Pytest request object.
|
|
|
|
u_boot_config: U-boot configuration.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
A fixture for basic fs test, i.e. a triplet of file system type,
|
|
|
|
volume file name and a list of MD5 hashes.
|
|
|
|
"""
|
2018-09-11 06:59:19 +00:00
|
|
|
fs_type = request.param
|
|
|
|
fs_img = ''
|
|
|
|
|
|
|
|
fs_ubtype = fstype_to_ubname(fs_type)
|
|
|
|
check_ubconfig(u_boot_config, fs_ubtype)
|
|
|
|
|
|
|
|
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
|
|
|
|
|
|
|
small_file = mount_dir + '/' + SMALL_FILE
|
|
|
|
big_file = mount_dir + '/' + BIG_FILE
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
# 3GiB volume
|
|
|
|
fs_img = mk_fs(u_boot_config, fs_type, 0xc0000000, '3GB')
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
return
|
2018-09-11 06:59:19 +00:00
|
|
|
|
2021-02-11 14:40:12 +00:00
|
|
|
try:
|
2018-09-11 06:59:19 +00:00
|
|
|
check_call('mkdir -p %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
return
|
2021-02-11 14:40:12 +00:00
|
|
|
|
|
|
|
try:
|
|
|
|
# Mount the image so we can populate it.
|
2018-09-11 06:59:19 +00:00
|
|
|
mount_fs(fs_type, fs_img, mount_dir)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
|
|
|
return
|
2018-09-11 06:59:19 +00:00
|
|
|
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
try:
|
2018-09-11 06:59:19 +00:00
|
|
|
# Create a subdirectory.
|
|
|
|
check_call('mkdir %s/SUBDIR' % mount_dir, shell=True)
|
|
|
|
|
|
|
|
# Create big file in this image.
|
|
|
|
# Note that we work only on the start 1MB, couple MBs in the 2GB range
|
|
|
|
# and the last 1 MB of the huge 2.5GB file.
|
|
|
|
# So, just put random values only in those areas.
|
|
|
|
check_call('dd if=/dev/urandom of=%s bs=1M count=1'
|
|
|
|
% big_file, shell=True)
|
|
|
|
check_call('dd if=/dev/urandom of=%s bs=1M count=2 seek=2047'
|
|
|
|
% big_file, shell=True)
|
|
|
|
check_call('dd if=/dev/urandom of=%s bs=1M count=1 seek=2499'
|
|
|
|
% big_file, shell=True)
|
|
|
|
|
|
|
|
# Create a small file in this image.
|
|
|
|
check_call('dd if=/dev/urandom of=%s bs=1M count=1'
|
|
|
|
% small_file, shell=True)
|
|
|
|
|
|
|
|
# Delete the small file copies which possibly are written as part of a
|
|
|
|
# previous test.
|
|
|
|
# check_call('rm -f "%s.w"' % MB1, shell=True)
|
|
|
|
# check_call('rm -f "%s.w2"' % MB1, shell=True)
|
|
|
|
|
|
|
|
# Generate the md5sums of reads that we will test against small file
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=1M skip=0 count=1 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% small_file, shell=True).decode()
|
2018-09-11 06:59:19 +00:00
|
|
|
md5val = [ out.split()[0] ]
|
|
|
|
|
|
|
|
# Generate the md5sums of reads that we will test against big file
|
|
|
|
# One from beginning of file.
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=1M skip=0 count=1 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% big_file, shell=True).decode()
|
2018-09-11 06:59:19 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
|
|
|
# One from end of file.
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=1M skip=2499 count=1 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% big_file, shell=True).decode()
|
2018-09-11 06:59:19 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
|
|
|
# One from the last 1MB chunk of 2GB
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=1M skip=2047 count=1 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% big_file, shell=True).decode()
|
2018-09-11 06:59:19 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
|
|
|
# One from the start 1MB chunk from 2GB
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=1M skip=2048 count=1 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% big_file, shell=True).decode()
|
2018-09-11 06:59:19 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
|
|
|
# One 1MB chunk crossing the 2GB boundary
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=512K skip=4095 count=2 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% big_file, shell=True).decode()
|
2018-09-11 06:59:19 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
2020-04-20 18:48:40 +00:00
|
|
|
except CalledProcessError as err:
|
2021-02-11 14:40:12 +00:00
|
|
|
pytest.skip('Setup failed for filesystem: ' + fs_type + '. {}'.format(err))
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2018-09-11 06:59:19 +00:00
|
|
|
return
|
|
|
|
else:
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2018-09-11 06:59:19 +00:00
|
|
|
yield [fs_ubtype, fs_img, md5val]
|
|
|
|
finally:
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
2018-09-11 06:59:20 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Fixture for extended fs test
|
|
|
|
#
|
2021-01-28 19:39:56 +00:00
|
|
|
@pytest.fixture()
|
2018-09-11 06:59:20 +00:00
|
|
|
def fs_obj_ext(request, u_boot_config):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Set up a file system to be used in extended fs test.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
request: Pytest request object.
|
|
|
|
u_boot_config: U-boot configuration.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
A fixture for extended fs test, i.e. a triplet of file system type,
|
|
|
|
volume file name and a list of MD5 hashes.
|
|
|
|
"""
|
2018-09-11 06:59:20 +00:00
|
|
|
fs_type = request.param
|
|
|
|
fs_img = ''
|
|
|
|
|
|
|
|
fs_ubtype = fstype_to_ubname(fs_type)
|
|
|
|
check_ubconfig(u_boot_config, fs_ubtype)
|
|
|
|
|
|
|
|
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
|
|
|
|
|
|
|
min_file = mount_dir + '/' + MIN_FILE
|
|
|
|
tmp_file = mount_dir + '/tmpfile'
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
# 128MiB volume
|
|
|
|
fs_img = mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
return
|
2018-09-11 06:59:20 +00:00
|
|
|
|
2021-02-11 14:40:12 +00:00
|
|
|
try:
|
2018-09-11 06:59:20 +00:00
|
|
|
check_call('mkdir -p %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
return
|
2021-02-11 14:40:12 +00:00
|
|
|
|
|
|
|
try:
|
|
|
|
# Mount the image so we can populate it.
|
2018-09-11 06:59:20 +00:00
|
|
|
mount_fs(fs_type, fs_img, mount_dir)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
|
|
|
return
|
2018-09-11 06:59:20 +00:00
|
|
|
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
try:
|
2018-09-11 06:59:20 +00:00
|
|
|
# Create a test directory
|
|
|
|
check_call('mkdir %s/dir1' % mount_dir, shell=True)
|
|
|
|
|
|
|
|
# Create a small file and calculate md5
|
|
|
|
check_call('dd if=/dev/urandom of=%s bs=1K count=20'
|
|
|
|
% min_file, shell=True)
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=1K 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% min_file, shell=True).decode()
|
2018-09-11 06:59:20 +00:00
|
|
|
md5val = [ out.split()[0] ]
|
|
|
|
|
|
|
|
# Calculate md5sum of Test Case 4
|
|
|
|
check_call('dd if=%s of=%s bs=1K count=20'
|
|
|
|
% (min_file, tmp_file), shell=True)
|
|
|
|
check_call('dd if=%s of=%s bs=1K seek=5 count=20'
|
|
|
|
% (min_file, tmp_file), shell=True)
|
|
|
|
out = check_output('dd if=%s bs=1K 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% tmp_file, shell=True).decode()
|
2018-09-11 06:59:20 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
|
|
|
# Calculate md5sum of Test Case 5
|
|
|
|
check_call('dd if=%s of=%s bs=1K count=20'
|
|
|
|
% (min_file, tmp_file), shell=True)
|
|
|
|
check_call('dd if=%s of=%s bs=1K seek=5 count=5'
|
|
|
|
% (min_file, tmp_file), shell=True)
|
|
|
|
out = check_output('dd if=%s bs=1K 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% tmp_file, shell=True).decode()
|
2018-09-11 06:59:20 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
|
|
|
# Calculate md5sum of Test Case 7
|
|
|
|
check_call('dd if=%s of=%s bs=1K count=20'
|
|
|
|
% (min_file, tmp_file), shell=True)
|
|
|
|
check_call('dd if=%s of=%s bs=1K seek=20 count=20'
|
|
|
|
% (min_file, tmp_file), shell=True)
|
|
|
|
out = check_output('dd if=%s bs=1K 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% tmp_file, shell=True).decode()
|
2018-09-11 06:59:20 +00:00
|
|
|
md5val.append(out.split()[0])
|
|
|
|
|
|
|
|
check_call('rm %s' % tmp_file, shell=True)
|
|
|
|
except CalledProcessError:
|
|
|
|
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2018-09-11 06:59:20 +00:00
|
|
|
return
|
|
|
|
else:
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2018-09-11 06:59:20 +00:00
|
|
|
yield [fs_ubtype, fs_img, md5val]
|
|
|
|
finally:
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
2018-09-11 06:59:21 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Fixture for mkdir test
|
|
|
|
#
|
2021-01-28 19:39:56 +00:00
|
|
|
@pytest.fixture()
|
2018-09-11 06:59:21 +00:00
|
|
|
def fs_obj_mkdir(request, u_boot_config):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Set up a file system to be used in mkdir test.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
request: Pytest request object.
|
|
|
|
u_boot_config: U-boot configuration.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
A fixture for mkdir test, i.e. a duplet of file system type and
|
|
|
|
volume file name.
|
|
|
|
"""
|
2018-09-11 06:59:21 +00:00
|
|
|
fs_type = request.param
|
|
|
|
fs_img = ''
|
|
|
|
|
|
|
|
fs_ubtype = fstype_to_ubname(fs_type)
|
|
|
|
check_ubconfig(u_boot_config, fs_ubtype)
|
|
|
|
|
|
|
|
try:
|
|
|
|
# 128MiB volume
|
|
|
|
fs_img = mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
|
|
|
|
except:
|
|
|
|
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
2021-02-11 14:40:12 +00:00
|
|
|
return
|
2018-09-11 06:59:21 +00:00
|
|
|
else:
|
|
|
|
yield [fs_ubtype, fs_img]
|
2021-02-11 14:40:12 +00:00
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
2018-09-11 07:06:03 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Fixture for unlink test
|
|
|
|
#
|
2021-01-28 19:39:56 +00:00
|
|
|
@pytest.fixture()
|
2018-09-11 07:06:03 +00:00
|
|
|
def fs_obj_unlink(request, u_boot_config):
|
2018-09-27 07:07:23 +00:00
|
|
|
"""Set up a file system to be used in unlink test.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
request: Pytest request object.
|
|
|
|
u_boot_config: U-boot configuration.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
A fixture for unlink test, i.e. a duplet of file system type and
|
|
|
|
volume file name.
|
|
|
|
"""
|
2018-09-11 07:06:03 +00:00
|
|
|
fs_type = request.param
|
|
|
|
fs_img = ''
|
|
|
|
|
|
|
|
fs_ubtype = fstype_to_ubname(fs_type)
|
|
|
|
check_ubconfig(u_boot_config, fs_ubtype)
|
|
|
|
|
|
|
|
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
# 128MiB volume
|
|
|
|
fs_img = mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
return
|
2018-09-11 07:06:03 +00:00
|
|
|
|
2021-02-11 14:40:12 +00:00
|
|
|
try:
|
2018-09-11 07:06:03 +00:00
|
|
|
check_call('mkdir -p %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
return
|
2021-02-11 14:40:12 +00:00
|
|
|
|
|
|
|
try:
|
|
|
|
# Mount the image so we can populate it.
|
2018-09-11 07:06:03 +00:00
|
|
|
mount_fs(fs_type, fs_img, mount_dir)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
|
|
|
return
|
2018-09-11 07:06:03 +00:00
|
|
|
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
try:
|
2018-09-11 07:06:03 +00:00
|
|
|
# Test Case 1 & 3
|
|
|
|
check_call('mkdir %s/dir1' % mount_dir, shell=True)
|
|
|
|
check_call('dd if=/dev/urandom of=%s/dir1/file1 bs=1K count=1'
|
|
|
|
% mount_dir, shell=True)
|
|
|
|
check_call('dd if=/dev/urandom of=%s/dir1/file2 bs=1K count=1'
|
|
|
|
% mount_dir, shell=True)
|
|
|
|
|
|
|
|
# Test Case 2
|
|
|
|
check_call('mkdir %s/dir2' % mount_dir, shell=True)
|
2019-10-24 15:59:20 +00:00
|
|
|
for i in range(0, 20):
|
|
|
|
check_call('mkdir %s/dir2/0123456789abcdef%02x'
|
2018-09-11 07:06:03 +00:00
|
|
|
% (mount_dir, i), shell=True)
|
|
|
|
|
|
|
|
# Test Case 4
|
|
|
|
check_call('mkdir %s/dir4' % mount_dir, shell=True)
|
|
|
|
|
|
|
|
# Test Case 5, 6 & 7
|
|
|
|
check_call('mkdir %s/dir5' % mount_dir, shell=True)
|
|
|
|
check_call('dd if=/dev/urandom of=%s/dir5/file1 bs=1K count=1'
|
|
|
|
% mount_dir, shell=True)
|
|
|
|
|
|
|
|
except CalledProcessError:
|
|
|
|
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2018-09-11 07:06:03 +00:00
|
|
|
return
|
|
|
|
else:
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2018-09-11 07:06:03 +00:00
|
|
|
yield [fs_ubtype, fs_img]
|
|
|
|
finally:
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
2019-02-13 11:15:27 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Fixture for symlink fs test
|
|
|
|
#
|
2021-01-28 19:39:56 +00:00
|
|
|
@pytest.fixture()
|
2019-02-13 11:15:27 +00:00
|
|
|
def fs_obj_symlink(request, u_boot_config):
|
|
|
|
"""Set up a file system to be used in symlink fs test.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
request: Pytest request object.
|
|
|
|
u_boot_config: U-boot configuration.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
A fixture for basic fs test, i.e. a triplet of file system type,
|
|
|
|
volume file name and a list of MD5 hashes.
|
|
|
|
"""
|
|
|
|
fs_type = request.param
|
|
|
|
fs_img = ''
|
|
|
|
|
|
|
|
fs_ubtype = fstype_to_ubname(fs_type)
|
|
|
|
check_ubconfig(u_boot_config, fs_ubtype)
|
|
|
|
|
|
|
|
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
|
|
|
|
|
|
|
small_file = mount_dir + '/' + SMALL_FILE
|
|
|
|
medium_file = mount_dir + '/' + MEDIUM_FILE
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
2021-02-11 14:40:12 +00:00
|
|
|
# 1GiB volume
|
2019-02-13 11:15:27 +00:00
|
|
|
fs_img = mk_fs(u_boot_config, fs_type, 0x40000000, '1GB')
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
return
|
2019-02-13 11:15:27 +00:00
|
|
|
|
2021-02-11 14:40:12 +00:00
|
|
|
try:
|
2019-02-13 11:15:27 +00:00
|
|
|
check_call('mkdir -p %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
return
|
2021-02-11 14:40:12 +00:00
|
|
|
|
|
|
|
try:
|
|
|
|
# Mount the image so we can populate it.
|
2019-02-13 11:15:27 +00:00
|
|
|
mount_fs(fs_type, fs_img, mount_dir)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
except CalledProcessError as err:
|
|
|
|
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
|
|
|
call('rm -f %s' % fs_img, shell=True)
|
|
|
|
return
|
2019-02-13 11:15:27 +00:00
|
|
|
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
try:
|
2019-02-13 11:15:27 +00:00
|
|
|
# Create a subdirectory.
|
|
|
|
check_call('mkdir %s/SUBDIR' % mount_dir, shell=True)
|
|
|
|
|
|
|
|
# Create a small file in this image.
|
|
|
|
check_call('dd if=/dev/urandom of=%s bs=1M count=1'
|
|
|
|
% small_file, shell=True)
|
|
|
|
|
|
|
|
# Create a medium file in this image.
|
|
|
|
check_call('dd if=/dev/urandom of=%s bs=10M count=1'
|
|
|
|
% medium_file, shell=True)
|
|
|
|
|
|
|
|
# Generate the md5sums of reads that we will test against small file
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=1M skip=0 count=1 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% small_file, shell=True).decode()
|
2019-02-13 11:15:27 +00:00
|
|
|
md5val = [out.split()[0]]
|
|
|
|
out = check_output(
|
|
|
|
'dd if=%s bs=10M skip=0 count=1 2> /dev/null | md5sum'
|
2019-10-24 15:59:24 +00:00
|
|
|
% medium_file, shell=True).decode()
|
2019-02-13 11:15:27 +00:00
|
|
|
md5val.extend([out.split()[0]])
|
|
|
|
|
|
|
|
except CalledProcessError:
|
|
|
|
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2019-02-13 11:15:27 +00:00
|
|
|
return
|
|
|
|
else:
|
test: Fix filesystem tests always being skipped
Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
fixes an issue in the filesystem tests where the test setup may fail
to mount an image and still attempt to unmount it. However, the commit
unintentionally breaks the test setups in two ways.
The newly created unmounted filesystem images are being immediately
deleted due to some cleanup steps being misplaced into finally blocks,
which makes them always run instead of only on failures. The mount calls
always fail since the images never exist, causing the tests to be always
skipped. This patch moves these cleanup calls into the except blocks to
fix this and makes the tests run again.
There are also unmount calls misplaced into finally blocks, making them
run after the tests instead of before the tests. These unmount calls
make the filesystem image file consistent with the changes made to it as
part of the test setup, and this misplacement is making a number of
tests fail unexpectedly.
The unmount calls must be run before the tests use the image, meaning
before the yield call and not in the finally block. They must also be
run as a cleanup step when the filesystem setup fails, so they can't be
placed as the final call in the try blocks since they would be skipped
on such failures. For these reasons, this patch places the unmount calls
both in the except blocks and the else blocks of the final setup step.
This makes the unexpectedly failing tests to succeed again.
Furthermore, this isolates the mount calls to their own try-except
statement to avoid reintroducing the original issue of unmounting a
not-mounted image while fixing the unmount misplacement.
After these fixes, running "make tests" with guestmount available results
in two test failures not related to the mentioned commit. If the
guestmount executables are unavailable, the mounts fallback to using
sudo and result in no failures.
Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system")
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2021-05-20 19:09:46 +00:00
|
|
|
umount_fs(mount_dir)
|
2019-02-13 11:15:27 +00:00
|
|
|
yield [fs_ubtype, fs_img, md5val]
|
|
|
|
finally:
|
|
|
|
call('rmdir %s' % mount_dir, shell=True)
|
2021-02-11 14:40:12 +00:00
|
|
|
call('rm -f %s' % fs_img, shell=True)
|