summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2011-09-14 13:00:34 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-09-16 15:39:52 +0100
commitace6ecafb87949c27ce5a53cd24821cbf552718d (patch)
tree80752e094a8cd1c376e8ac3166b933856575f2c6
parentb163b96a85756f5ccd3a6013f0e32e6412c7acee (diff)
downloadlibguestfs-ace6ecafb87949c27ce5a53cd24821cbf552718d.tar.gz
libguestfs-ace6ecafb87949c27ce5a53cd24821cbf552718d.tar.xz
libguestfs-ace6ecafb87949c27ce5a53cd24821cbf552718d.zip
test-tool: Make the default timeout be 600 seconds (10 minutes).
We could sometimes hit the 120 second timeout, eg. if the appliance needed to be rebuilt and the machine was very slow and/or under heavy I/O load. 10 minutes should be enough for any reasonable situation. (cherry picked from commit 912284b02e28bd63bdf3397ef841b9782adfd2cd)
-rw-r--r--test-tool/libguestfs-test-tool.pod5
-rw-r--r--test-tool/test-tool.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/test-tool/libguestfs-test-tool.pod b/test-tool/libguestfs-test-tool.pod
index 5957c88e..c96acb7f 100644
--- a/test-tool/libguestfs-test-tool.pod
+++ b/test-tool/libguestfs-test-tool.pod
@@ -56,9 +56,8 @@ directory to try it.
=item B<--timeout N>
-Set the launch timeout to C<N> seconds. The default is 120 seconds
-which does not usually need to be adjusted unless your machine is very
-slow.
+Set the launch timeout to C<N> seconds. The default is 600 seconds
+(10 minutes) which does not usually need to be adjusted.
=back
diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
index 59b9d67a..ca8d9b8c 100644
--- a/test-tool/test-tool.c
+++ b/test-tool/test-tool.c
@@ -64,7 +64,7 @@
#define P_tmpdir "/tmp"
#endif
-#define DEFAULT_TIMEOUT 120
+#define DEFAULT_TIMEOUT 600
static int timeout = DEFAULT_TIMEOUT;
static char tmpf[] = P_tmpdir "/libguestfs-test-tool-sda-XXXXXX";