diff options
author | Jim Meyering <meyering@redhat.com> | 2010-11-18 14:39:42 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2010-11-20 11:42:07 +0100 |
commit | 5077bc959d07e844ede24eb62b5ac1ff635032bb (patch) | |
tree | e4e6e7d5aadcd8687214eac020342fa8acd90a98 /tests/t1101-busy-partition.sh | |
parent | 198971a4fbe7b8184cdd08b774ff7a71573107b0 (diff) | |
download | parted-5077bc959d07e844ede24eb62b5ac1ff635032bb.tar.gz |
tests: init.cfg: copy envvar setings from testlib.sh:
Unset TERM and CDPATH; sanitize LC_ALL, TZ, LANG, and set
PARTED_SUPPRESS_FILE_SYSTEM_MANIPULATION_WARNING=1.
* tests/t1101-busy-partition.sh: Expect no output, now that we set
PARTED_SUPPRESS_FILE_SYSTEM_MANIPULATION_WARNING=1.
Diffstat (limited to 'tests/t1101-busy-partition.sh')
-rwxr-xr-x | tests/t1101-busy-partition.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tests/t1101-busy-partition.sh b/tests/t1101-busy-partition.sh index 33b6fe6..dbeb23a 100755 --- a/tests/t1101-busy-partition.sh +++ b/tests/t1101-busy-partition.sh @@ -33,15 +33,6 @@ scsi_debug_setup_ dev_size_mb=80 > dev-name || skip_test_ 'failed to create scsi_debug device' dev=$(cat dev-name) -cat <<EOF > exp-warning || framework_failure -WARNING: you are attempting to use parted to operate on (mkpartfs) a file system. -parted's file system manipulation code is not as robust as what you'll find in -dedicated, file-system-specific packages like e2fsprogs. We recommend -you use parted only to manipulate partition tables, whenever possible. -Support for performing most operations on most types of file systems -will be removed in an upcoming release. -EOF - cat <<EOF > exp-error || framework_failure Error: Partition ${dev}2 is being used. You must unmount it before you modify it with Parted. EOF @@ -54,17 +45,13 @@ parted -s "$dev" mklabel msdos > out 2>&1 || fail=1 compare out /dev/null || fail=1 parted -s "$dev" mkpartfs primary fat32 1 40 > out 2>&1 || fail=1 - -# expect warning -compare out exp-warning || fail=1 +compare out /dev/null || fail=1 parted -s "$dev" mkpartfs primary fat32 40 80 > out 2>&1 || fail=1 # wait for new partition device to appear wait_for_dev_to_appear_ ${dev}2 - -# expect warning -compare out exp-warning || fail=1 +compare out /dev/null || fail=1 # be sure to unmount upon interrupt, failure, etc. cleanup_() { umount "${dev}2" > /dev/null 2>&1; } |