virt-clone: Don't continuosly error if first disk prompt is bogus

Author: crobinso

tests/clitest.py

@@ -19,6 +19,7 @@
 import shlex
 import subprocess
 import sys
+import time
 import traceback
 import unittest
 import StringIO
@@ -1254,6 +1255,17 @@ def _launch_command(self):
                 proc.kill()
                 break
 
+        exited = False
+        for i in range(30):
+            if proc.poll() is not None:
+                exited = True
+                break
+            time.sleep(.1)
+
+        if not exited:
+            proc.kill()
+            out += "\nProcess was killed by test harness"
+
         return proc.wait(), out
 
 
@@ -1310,6 +1322,14 @@ def _launch_command(self):
 p6.add("use as the cloned disk", "%(NEWIMG2)s")
 promptlist.append(p6)
 
+# Basic virt-clone prompting with disk failure handling
+p7 = PromptTest("virt-clone --connect %(TESTURI)s --prompt --quiet "
+               "--clone-running -o test-clone-simple -n test-clone-new")
+p7.add("use as the cloned disk", "/root")
+p7.add("'/root' must be a file or a device")
+p7.add("use as the cloned disk", "%(MANAGEDNEW1)s")
+promptlist.append(p7)
+
 
 #########################
 # Test runner functions #

virtinst/cli.py

@@ -708,7 +708,8 @@ def prompt_size_conflict(dev):
         # If we fail within the loop, reprompt for size and path
         if not retry_path:
             origpath = None
-            origsize = None
+            if not path_to_clone:
+                origsize = None
         retry_path = False
 
         # Get disk path