Merge lp:~linaro-validation/lava-core/doanac-fixes into lp:~zyga/lava-core/demo-3

[Michael Hudson-Doyle]

Reproposing the branch against a better target so the diff makes some sense.

From the original proposal (https://code.launchpad.net/~linaro-validation/lava-core/doanac-fixes/+merge/106725):

zygmunt - not sure what you want to do with these, but here are some minro fixes I had to make to get things working for me.

[Zygmunt Krynicki (zyga)]

66 + def decompress(self, stream, suffix):
67 + commands = { 'gz':'gunzip', 'bz2':'bunzip2' }
68 + command = commands[suffix]
69 + uncompressed_name = stream.name[:-len(suffix)-1]
70 + self.logger.info("Uncompressing %s with %s to %s",
71 + stream.name, command, uncompressed_name)
72 + subprocess.check_call(
73 + [command, '-c', stream.name], stdout=open(uncompressed_name, 'w'))
74 + stream.name = uncompressed_name

As discussed on IRC, I'd prefer a pure python solution for reliability. I'll get this in and then rewrite it as things land to trunk. Thanks

review: Approve

=== modified file 'history_demo.py'
--- history_demo.py	2012-04-26 02:03:09 +0000
+++ history_demo.py	2012-05-23 04:07:21 +0000
@@ -18,7 +18,7 @@
 # along with lava-core.  If not, see <http://www.gnu.org/licenses/>.
 
 from json_document.serializers import JSON
-from lava.utils.logging.history import history
+from lava.core.history import history
 
 
 def get_food():

=== modified file 'lava/core/controllers/devices/qemu.py'
--- lava/core/controllers/devices/qemu.py	2012-05-04 02:29:53 +0000
+++ lava/core/controllers/devices/qemu.py	2012-05-23 04:07:21 +0000
@@ -214,7 +214,7 @@
     def _use_prebuilt_image(self, session):
         # TODO: wrap download issues as UnrecoverableProblem
         return session.network.download(
-            self.configuration.image, hint='image')
+            self.configuration.image, compressed=True)
 
     def _use_partial_image(self, session):
         # Download both pieces

=== modified file 'lava/core/utils.py'
--- lava/core/utils.py	2012-05-11 15:27:07 +0000
+++ lava/core/utils.py	2012-05-23 04:07:21 +0000
@@ -34,6 +34,7 @@
 import datetime
 import os
 import shutil
+import subprocess
 import sys
 import tempfile
 
@@ -214,10 +215,12 @@
         self._scratch = scratch
         self._proxies = {'http': http_proxy, 'https': https_proxy}
 
-    def download(self, url, hint=''):
+    def download(self, url, compressed=False, hint=None):
         """
         Download something to temporary session storage
 
+        If compressed, the file will be decompressed while downloading
+
         Extra suffix, if provided, helps to identify the file as if will be
         used in the part of the temporary name.
 
@@ -231,11 +234,25 @@
             except requests.exceptions.RequestException as exc:
                 raise UnrecoverableProblem(
                     "Cannot download: {0}: {1}".format(url, exc))
+            if hint is None:
+                hint = url.split('.')[-1]
             with self._scratch.unique(prefix='download.',
                                       suffix="." + hint) as stream:
                 down.save(stream)
+                stream.close() #flush to disk
+                if compressed:
+                    self.decompress(stream, hint)
             return stream.name
 
+    def decompress(self, stream, suffix):
+        commands = { 'gz':'gunzip', 'bz2':'bunzip2' }
+        command = commands[suffix]
+        uncompressed_name = stream.name[:-len(suffix)-1]
+        self.logger.info("Uncompressing %s with %s to %s",
+            stream.name, command, uncompressed_name)
+        subprocess.check_call(
+            [command, '-c', stream.name], stdout=open(uncompressed_name, 'w'))
+        stream.name = uncompressed_name
 
 class ObjectWithConfiguration(object):
     """

=== modified file 'setup.py'
--- setup.py	2012-05-11 15:27:07 +0000
+++ setup.py	2012-05-23 04:07:21 +0000
@@ -80,6 +80,8 @@
         'argparse >= 1.1',
         'json-document >= 0.8',
         'json-schema-validator',
+        'keyring',
+        'setproctitle',
     ],
     tests_require=[
         'mocker >= 1.0',