Merge lp:~javier.collado/utah/bug1090013 into lp:utah

[Javier Collado]

Removed the code that generated the empty reports.

This has been successfully tested for the pass runlist and also
forcing a failure in `machine.installclient`.

[Max Brustkern (nuclearbob)]

This seems reasonable to me.

review: Approve

=== modified file 'utah/run.py'
--- utah/run.py	2012-12-06 16:30:34 +0000
+++ utah/run.py	2012-12-13 17:22:21 +0000
@@ -20,8 +20,6 @@
 import os
 import time
 import urllib
-import json
-import yaml
 import traceback
 
 from utah import config
@@ -47,49 +45,24 @@
             machine.logger.error('Failed to run test: ' + str(error))
             exitstatus = 1
 
-        _write(runlist, stdout)
+        if stdout is not None:
+            _write(runlist, stdout)
 
         return exitstatus
 
-    def _write(runlist, report=None):
+    def _write(runlist, report):
         """Write runlist report.
 
         Report will be written using appropriate filename based on the runlist.
-        If report is None becase there was some problem, then a default empty
-        report will be generated.
+
+        :param runlist: Path to the runlist file
+        :type runlist: str
+        :param report: Report to be written in any of the supported formats.
+        :type report: str
 
         """
         timestamp = time.strftime('%Y-%m-%d_%H-%m-%S', time.gmtime())
 
-        if report is None:
-            # Generate default report with empty results to fake client output
-            default_report = {
-                'runlist': runlist,
-                'media-info': machine.image.media_info,
-                'build_number': machine.image.buildnumber,
-                'release': machine.image.series,
-                'ran_at': timestamp,
-                'install_type': machine.installtype,
-                'arch': machine.arch,
-                'commands': [],
-                'fetch_errors': 0,
-                'errors': 0,
-                'failures': 0,
-                'passes': 0,
-                'uname': '',
-
-
-            }
-            if report_type == 'json':
-                report = json.dumps(default_report)
-            elif report_type == 'yaml':
-                report = yaml.dump(default_report,
-                                   explicit_start='---',
-                                   default_flow_style=False)
-            else:
-                raise ValueError('Unexpected report type: {}'
-                                 .format(report_type))
-
         listname = os.path.basename(runlist)
         log_filename = ('{machine}_{runlist}_{timestamp}.{suffix}'
                         .format(machine=machine.name,