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)

diff --git a/test-tool/libguestfs-test-tool.pod b/test-tool/libguestfs-test-tool.pod
index 5957c88..c96acb7 100644 (file)
--- 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 59b9d67..ca8d9b8 100644 (file)
--- 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";