Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-fix-bugs into lp:adt-cloud-worker

[Thomi Richards]

Malformed test request payloads are now processed correctly.

This branch fixes two things:

1) It updates README.rst to be accurate (need to get uci-nova ssh setup script and install it manually - autopkgtest from phase0 PPA isn't enough).

2) It fixes a bug where, if a test payload message didn't have some of the required keys the resulting exception would crash the service.

[Celso Providelo (cprov)]

Thomi,

Thanks for the code and doc tweak.

The charm & mojo spec codifies the uci-nova interim procedure for now, if we fork adt in our ppa it looks like it will be more trouble to merge trunk changes that we might need in this process, but maybe that's not necessarily true, we should re-evaluate this as we progress.

[]

review: Approve

=== modified file 'README.rst'
--- README.rst	2015-03-04 22:55:10 +0000
+++ README.rst	2015-03-16 03:23:01 +0000
@@ -35,6 +35,12 @@
   $ sudo apt-get update
   $ sudo apt-get install autopkgtest
 
+.. note::
+  Thomi: At the time of writing (16/3/2015), the autopkgtest from the PPA is not
+  enough to make this work. You also need to manually branch 
+  lp:~canonical-ci-engineering/adt-cloud-worker/uci-nova and follow the instructions
+  there.
+
 Install the service itself::
 
   $ python setup.py install

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-12 15:41:50 +0000
+++ adt_cloud_worker/__init__.py	2015-03-16 03:23:01 +0000
@@ -77,12 +77,12 @@
         for later checking.
         """
         logger.info('Got: {}'.format(body))
-        _validate_request_contents(body)
-
         body['worker'] = self.worker_name
+
         # Run requested tests safely.
         tarball_path = None
         try:
+            _validate_request_contents(body)
             # Create and temporary directory for storing adt results.
             dir_prefix = 'adt-{}-{}'.format(
                 self.worker_name, body['request_id'])