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

[Javier Collado]

This branch takes advantage of the fact that `SSHMixin.run` now returns the command `stdout` to get the output from `utah -r <runlist>` so that it can be printed to the log file as well.

In the past the log file was written to a remote file and downloaded to a local file. With this change, the `stdout` is captured through SSH and written to a local file directly.

[Max Brustkern (nuclearbob)]

This is a great idea. I think it may solve another problem I'm having as well.

review: Approve

=== modified file 'utah/run.py'
--- utah/run.py	2012-08-16 13:12:51 +0000
+++ utah/run.py	2012-08-28 03:04:20 +0000
@@ -29,46 +29,31 @@
     machine.installclient()
     for runlist in args.runlists:
         locallist = urllib.urlretrieve(runlist)[0]
+        machine.uploadfiles([locallist], os.path.normpath('/tmp'))
+
+        options = ' -r /tmp/' + os.path.basename(locallist)
+        utah_command = 'utah' + extraopts + options
+        try:
+            returncode, stdout, stderr = machine.run(utah_command)
+            if returncode != 0:
+                machine.logger.error('utah failed with return code: {}\n'
+                                     .format(returncode))
+                exitstatus = 1
+                break
+        except UTAHException as error:
+            machine.logger.error('Failed to run test: ' + str(error))
+            exitstatus = 1
+            break
+
         listname = os.path.basename(runlist)
-        remotelog = os.path.join(config.logpath,
-                machine.name + '_' + listname + '_tmp')
-        remotelog = os.path.normpath(remotelog)
         locallog = os.path.join(config.logpath,
                 machine.name + '_' + listname
                 + time.strftime('_%Y-%m-%d_%H-%m-%S', time.gmtime())
                 + suffix)
         locallog = os.path.normpath(locallog)
-        try:
-            machine.uploadfiles([locallist], os.path.normpath('/tmp'))
-            options = (' -r /tmp/' + os.path.basename(locallist)
-                       + ' -o ' + remotelog)
-            utah_command = 'utah' + extraopts + options
-            try:
-                returncode = machine.run(utah_command, root=True)[0]
-                if returncode != 0:
-                    machine.logger.error('utah failed with return code: {}\n'
-                                         .format(returncode))
-                    exitstatus = 1
-                    break
-            except UTAHException as error:
-                machine.logger.error('Failed to run test: ' + str(error))
-                exitstatus = 1
-
-            try:
-                machine.downloadfiles([remotelog], locallog)
-            except IOError as error:
-                machine.logger.error('Failed to download results: '
-                                     + str(error))
-                exitstatus = 1
-            else:
-                machine.logger.error('Test log copied to ' + locallog)
-                locallogs.append(locallog)
-        finally:
-            try:
-                machine.run('rm -f ' + remotelog)
-            except UTAHException as error:
-                machine.logger.error('Failed to cleanup test: ' + str(error))
-        if exitstatus != 0:
-            break
+        with open(locallog, 'w') as f:
+            f.write(stdout)
+        machine.logger.info('Test log copied to ' + locallog)
+        locallogs.append(locallog)
 
     return exitstatus, locallogs