Merge lp:~bladernr/checkbox/1186259-virtualization-fix into lp:checkbox

[Jeff Lane ]

virtualization script no longer chokes when image: is emtpy in the config file, meaning you can actually use hte script in an offline setting. Added some additional error handling to more explicitly trap errors.

[Daniel Manrique (roadmr)]

Looks good. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 15:07:02 +0000
+++ debian/changelog	2013-05-31 21:09:35 +0000
@@ -1,6 +1,9 @@
 checkbox (0.16.4) saucy; urgency=low
 
-  * Incremented version 
+    [ Jeff Lane ]
+    * scripts/virtualization: script no longer fails when trying to cast an
+      empty timeout setting in config file to int(). Added additional error
+      handling. (LP: #1186259)
 
  -- Brendan Donegan <[e-mail]>  Fri, 31 May 2013 16:04:42 +0100
 

=== modified file 'scripts/virtualization'
--- scripts/virtualization	2013-04-08 23:02:04 +0000
+++ scripts/virtualization	2013-05-31 21:09:35 +0000
@@ -168,6 +168,7 @@
 
 
     def start(self):
+        logging.debug('Starting KVM Test')
         status = 1
         # Create temp directory:
 
@@ -176,6 +177,7 @@
 
             os.chdir(temp_dir)
             if self.image is None:
+                logging.debug('No image specified, downloading one now.')
                 # Download cloud image
                 self.image = self.download_image()
 
@@ -219,17 +221,26 @@
 
     try:
         config.readfp(open(config_file))
-        timeout = int(config.get("KVM", "timeout"))
-        image = config.get("KVM", "image")
     except IOError:
         logging.warn("No config file found")
-    except Exception as exception:
-        logging.warn(exception)
+    else:
+        try:    
+            timeout = int(config.get("KVM", "timeout"))
+        except ValueError: 
+            logging.exception('Invalid or Empty timeout in config file. '
+                          'Falling back to default')
+        except configparser.NoSectionError as e:
+            logging.exception(e)
+        
+        try:
+            image = config.get("KVM", "image")
+        except configparser.NoSectionError:
+            logging.exception('Invalid or Empty image in config file.')
 
+    if timeout == "":
+        timeout = args.timeout
     if image == "":
         image = args.image
-    if timeout == "":
-        timeout = args.timeout
 
     kvm_test = KVMTest(image, timeout)
     result = kvm_test.start()
@@ -259,11 +270,16 @@
     kvm_test_parser.set_defaults(func=test_kvm)
 
     args = parser.parse_args()
-
-    if args.debug:
-        logging.basicConfig(level=logging.DEBUG)
-
-    args.func(args)
+    
+    try:
+        if args.debug:
+            logging.basicConfig(level=logging.DEBUG)
+    except AttributeError:
+        pass #avoids exception when trying to run without specifying 'kvm'
+    try:
+        args.func(args)
+    except AttributeError:
+        parser.error('Must specify a test type')
 
 if __name__ == "__main__":
     main()