git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d7ee3f
)
regressions: Fix test-launch-race to work in non-supermin case.
author
Richard W.M. Jones
<rjones@redhat.com>
Wed, 24 Nov 2010 08:38:35 +0000
(08:38 +0000)
committer
Richard W.M. Jones
<rjones@redhat.com>
Wed, 24 Nov 2010 09:41:51 +0000
(09:41 +0000)
regressions/test-launch-race.pl
patch
|
blob
|
history
diff --git
a/regressions/test-launch-race.pl
b/regressions/test-launch-race.pl
index
941eff6
..
892353e
100755
(executable)
--- a/
regressions/test-launch-race.pl
+++ b/
regressions/test-launch-race.pl
@@
-50,11
+50,15
@@
$g = undef;
waitpid ($pid, 0) or die ("waitpid: $!");
die ("child failed") unless ($? == 0);
waitpid ($pid, 0) or die ("waitpid: $!");
die ("child failed") unless ($? == 0);
-# Check that only 1 temporary cache directory was created
+# Check that only 1 temporary cache directory was created.
+#
+# No cache directory is OK too (as long as the appliance launched w/o
+# failure) because it indicates we're not using supermin.
my $dh;
opendir ($dh, $tmpdir) or die ("Failed to open $tmpdir: $!");
my @cachedirs = grep { /^guestfs\./ } readdir ($dh);
closedir ($dh) or die ("Failed to close $tmpdir: $!");
my $ncachedirs = scalar(@cachedirs);
my $dh;
opendir ($dh, $tmpdir) or die ("Failed to open $tmpdir: $!");
my @cachedirs = grep { /^guestfs\./ } readdir ($dh);
closedir ($dh) or die ("Failed to close $tmpdir: $!");
my $ncachedirs = scalar(@cachedirs);
-die ("Expected 1 cachedir, found $ncachedirs") unless ($ncachedirs == 1);
+die "Expected 0 or 1 cachedir, found $ncachedirs"
+ unless $ncachedirs == 0 || $ncachedirs == 1;