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

[Javier Collado]

To get the runlist when passed as a URL, these changes use urllib.urlretrieve
the same way as the code for run_utah_tests.py does.

Note that self.master_runlist isn't updated with the name of the temporary file
created after the download (local_filename). This should be fine as long as the
rest of the code that uses self.master_runlist doesn't assume it's a local
filename (please let me know if that's the case).

Finally, I tested the changes with both a local master.run example and the one
from the dev branch in launchpad and it worked fine:
http://bazaar.launchpad.net/~utah/utah/dev/download/head:/master.run-20120327155825-koxr3z6b4j69spb3-6/master.run

[Joe Talbott (joetalbott)]

Please add a comment in the code indicating that self.master_runlist points to the originally passed in runlist and not the local file to avoid future confusion. Other than that, looks great. Thanks!

review: Needs Fixing

[lp:~javier.collado/utah/bug1029493]

583. By Javier Collado on 2012-07-31

Added comments as suggested by Joe's review

[Javier Collado (javier.collado)]

Good idea, comments added.

review: Needs Resubmitting

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2012-07-31 20:27:32 +0000
+++ utah/client/runner.py	2012-07-31 20:34:19 +0000
@@ -9,6 +9,7 @@
 import shutil
 import stat
 import yaml
+import urllib
 
 from common import MASTER_RUNLIST, UTAH_DIR, DEFAULT_STATE_FILE
 from common import RETURN_CODES
@@ -35,6 +36,7 @@
     def __init__(self, runlist=MASTER_RUNLIST, result_class=Result,
             testdir=UTAH_DIR, state_agent=None, resume=False):
 
+        # Runlist URL passed through the command line
         self.master_runlist = runlist
         self.testdir = testdir
         self.suites = []
@@ -244,13 +246,11 @@
             fetch_cmd: get foo
           - include: another_master.run
         """
-
-        try:
-            fp = open(self.master_runlist, 'r')
+        # Download runlist using the URL passed through the commmand line to
+        # local filename if needed (it might be a local file already or cached)
+        local_filename = urllib.urlretrieve(self.master_runlist)[0]
+        with open(local_filename, 'r') as fp:
             data = yaml.load(fp)
-            fp.close()
-        except IOError as e:
-            raise exceptions.MissingFile(str(e))
 
         seen = []