Skip to content

Fixed kpartx delete partition mapping test #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed kpartx delete partition mapping test #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion linux-tools/kpartx/kpartx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ function run_kpartx_tests()

tc_register "Test kpartx -d"
kpartx -d $kpartx_img >$stdout 2>$stderr
grep "loop deleted" $stdout | grep -q /dev/$loopdev
# wait for max 10 sec to update
tc_wait_for_file_text $stdout "loop deleted : /dev/$loopdev"
tc_fail_if_bad $? "kpartx -d fail1" || return
Copy link
Contributor

@athira-rajeev athira-rajeev Apr 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you can add the failure string that comes in stderr , it gives a better understanding why the change is required.
Few things:

  • Can we add a check for "kpartx -d" first ?
    kpartx -d $kpartx_img >$stdout 2>$stderr
    tc_fail_if_bad $? "kpartx -d failed" || return

  • Followed by verifying the expected message in stdout
    tc_wait_for_file_text $stdout "loop deleted : /dev/$loopdev"

Also correct the error mesage: "kpartx -d fail1"

loopdev_free=`losetup -f | cut -d '/' -f3`
test $loopdev == $loopdev_free
Expand Down