summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Susi <psusi@ubuntu.com>2014-04-18 12:29:57 -0400
committerPhillip Susi <psusi@ubuntu.com>2014-04-18 12:55:20 -0400
commit60d7ceec9cbabbf114bb05b391f355fdbe418571 (patch)
treea51de8036217ba0c43d1e7373704cfb5c8e9215e
parentd1ca2a5eacc2de4b9f755c10fcf8b14e6c1d2dc1 (diff)
downloadparted-60d7ceec9cbabbf114bb05b391f355fdbe418571.tar.gz
tests: fix t1700
bb181a7e: "tests: Use force for xfs in t1700 and a larger file" caused the previous filesystem signatures to be left in the image file causing mkfs.nilfs2 to complain that there is already an xfs filesystem there, and hang the test suite waiting for an answer to proceed or not. Remove the file between filesystems so it is recreated cleanly again.
-rwxr-xr-xtests/t1700-probe-fs.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/t1700-probe-fs.sh b/tests/t1700-probe-fs.sh
index bf6ad9c..2ba2f95 100755
--- a/tests/t1700-probe-fs.sh
+++ b/tests/t1700-probe-fs.sh
@@ -39,6 +39,7 @@ for type in ext2 ext3 ext4 btrfs xfs nilfs2; do
# probe the $type file system
parted -m -s $dev u s print >out 2>&1 || fail=1
grep '^1:.*:'$type'::;$' out || { cat out; fail=1; }
+ rm $dev
done