mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/gdisk/test-expand-gpt.pl: Don't race with other tests

Browse Source 
Another test was removing all disk_*.img files, which removed the file
used by this test.  This was ultimately caused by us using parallel
tests.

Put the disk image files back into the tests/gdisk/ subdirectory to
avoid this race.

Fixes: commit 6d32773e81
This commit is contained in:
Richard W.M. Jones
2021-11-09 11:47:07 +00:00
parent 30a3c72d51
commit 4fe8df48a7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/gdisk/test-expand-gpt.pl
View File

@@ -24,8 +24,9 @@ sub tests {
my $g = Sys::Guestfs->new ();
foreach ("gpt", "mbr") {
$g->disk_create ("disk_$_.img", "qcow2", 50 * 1024 * 1024);
$g->add_drive ("disk_$_.img", format => "qcow2");
$g->disk_create ("gdisk/disk_$_.img",
"qcow2", 50 * 1024 * 1024);
$g->add_drive ("gdisk/disk_$_.img", format => "qcow2");
}
$g->launch ();
@@ -35,12 +36,12 @@ sub tests {
$g->close ();
die if system ("qemu-img resize disk_gpt.img 100M >/dev/null");
die if system ("qemu-img resize gdisk/disk_gpt.img 100M >/dev/null");
$g = Sys::Guestfs->new ();
foreach ("gpt", "mbr") {
$g->add_drive ("disk_$_.img", format => "qcow2");
$g->add_drive ("gdisk/disk_$_.img", format => "qcow2");
}
$g->launch ();
@@ -61,11 +62,11 @@ sub tests {
$g->close ();
# Disk shrink test
die if system ("qemu-img resize --shrink disk_gpt.img 50M >/dev/null");
die if system ("qemu-img resize --shrink gdisk/disk_gpt.img 50M >/dev/null");
$g = Sys::Guestfs->new ();
$g->add_drive ("disk_gpt.img", format => "qcow2");
$g->add_drive ("gdisk/disk_gpt.img", format => "qcow2");
$g->launch ();
die if $g->part_expand_gpt ("/dev/sda");
@@ -80,7 +81,7 @@ sub tests {
}
eval { tests() };
system ("rm -f disk_*.img");
system ("rm -f gdisk/disk_*.img");
if ($@) {
die;
}