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/nbd/test-nbd.pl: Multiple improvements.

Browse Source 
Use qemu-nbd --pid-file option so we don't have to use an arbitrary
sleep.

Enable all parts of the test, since everything should work now with
various upstream bugs having been fixed in the 8 years since the test
was originally written.
This commit is contained in:
Richard W.M. Jones
2021-03-22 14:12:43 +00:00
parent d4ab4ff683
commit 1eb055bd46
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/nbd/test-nbd.pl
View File

@@ -54,8 +54,10 @@ sub run_test {
my $readonly = shift;
my $tcp = shift;
my $cwd = getcwd ();
my $server;
my @qemu_nbd = ("qemu-nbd", $disk, "-t");
my $pidfile = "$cwd/nbd.pid";
my @qemu_nbd = ("qemu-nbd", $disk, "-t", "--pid-file", $pidfile);
if ($has_format_opt) {
push @qemu_nbd, "--format", "raw";
}
@@ -67,7 +69,6 @@ sub run_test {
}
else {
# qemu-nbd insists the socket path is absolute.
my $cwd = getcwd ();
my $socket = "$cwd/unix.sock";
unlink "$socket";
push @qemu_nbd, "-k", "$socket";
@@ -82,6 +83,13 @@ sub run_test {
die "qemu-nbd: $!";
}
# Wait for the pid file to appear.
for (my $i = 0; $i < 60; ++$i) {
last if -f $pidfile;
sleep 1
}
die "qemu-nbd did not start up\n" if ! -f $pidfile;
# XXX qemu-nbd lacks any way to tell if it is awake and listening
# for connections. It could write a pid file or something. Could
# we check that the socket has been opened by looking in netstat?
@@ -107,27 +115,17 @@ sub run_test {
kill 15, $pid;
waitpid ($pid, 0) or die "waitpid: $pid: $!";
$pid = 0;
unlink $pidfile
}
# Since read-only and read-write paths are quite different, we have to
# test both separately.
for my $readonly (1, 0) {
if ($readonly && Sys::Guestfs->new()->get_backend() eq "direct") {
printf "skipping readonly + appliance case:\n";
printf "https://bugs.launchpad.net/qemu/+bug/1155677\n";
next;
}
run_test ($readonly, 1);
}
# Test Unix domain socket codepath.
if (Sys::Guestfs->new()->get_backend() !~ /^libvirt/) {
run_test (0, 0);
} else {
printf "skipping Unix domain socket test:\n";
printf "https://bugzilla.redhat.com/show_bug.cgi?id=922888\n";
}
run_test (0, 0);
unlink $disk;