From 4fe8df48a7230b66ead0232b5b13bdf01e1b4344 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 9 Nov 2021 11:47:07 +0000
Subject: [PATCH] tests/gdisk/test-expand-gpt.pl: Don't race with other tests

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 6d32773e811882f78dbd8c2a39a2b7a9c3cfca7c
---
 tests/gdisk/test-expand-gpt.pl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/gdisk/test-expand-gpt.pl b/tests/gdisk/test-expand-gpt.pl
index 4dedb4eb3..23a52b23c 100755
--- a/tests/gdisk/test-expand-gpt.pl
+++ b/tests/gdisk/test-expand-gpt.pl
@@ -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;
 }