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

[Javier Collado]

This branch applies a retry strategy to workaround the failures when running
`adb shell getprop` command.

An example of the retry strategy working can be seen here (look for
"retrying"):
https://jenkins.qa.ubuntu.com/job/memevent-saucy-touch-armhf-default-mako-01/56/consoleFull

[Javier Collado (javier.collado)]

Note that `ADBShellError` is now a subclass of `UTAHException` because that's
required by the `retry` function to work correctly.

[Max Brustkern (nuclearbob)]

This looks good to me.

[Andy Doan (doanac)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-03 21:47:30 +0000
+++ debian/changelog	2013-07-10 17:03:31 +0000
@@ -10,6 +10,9 @@
   [ Max Brustkern ]
   * Made url_argument return None for empty URLs (LP: #1195469)
 
+  [ Javier Collado ]
+  * Retry `adb shell getprop` on failures (LP: #1197881)
+
  -- Andy Doan <doanac@doanac-laptop>  Tue, 25 Jun 2013 22:12:21 -0500
 
 utah (0.13.1ubuntu1) raring; urgency=low

=== modified file 'examples/run_utah_phablet.py'
--- examples/run_utah_phablet.py	2013-07-03 21:45:11 +0000
+++ examples/run_utah_phablet.py	2013-07-10 17:03:31 +0000
@@ -28,8 +28,9 @@
 
 from SimpleXMLRPCServer import SimpleXMLRPCServer
 
+from utah import template
 from utah.provisioning import touch
-from utah import template
+from utah.retry import retry
 
 CLIENT_PROBES_DIR = '/tmp/utah-probes'
 
@@ -99,10 +100,13 @@
 
 
 def _save_props(device, results_dir):
-    props = device.run_ubuntu('getprop')
-    props_file = os.path.join(results_dir, 'adb.props')
-    with open(props_file, 'w') as f:
-        f.write(props)
+    def run():
+        props = device.run_ubuntu('getprop')
+        props_file = os.path.join(results_dir, 'adb.props')
+        with open(props_file, 'w') as f:
+            f.write(props)
+
+    retry(run)
 
 
 def _configure_autorun(device, event_name, env):

=== modified file 'utah/provisioning/touch.py'
--- utah/provisioning/touch.py	2013-07-03 19:58:19 +0000
+++ utah/provisioning/touch.py	2013-07-10 17:03:31 +0000
@@ -25,15 +25,18 @@
 
 import utah.process as process
 
-
-class ADBShellError(Exception):
+from utah.exceptions import UTAHException
+
+
+class ADBShellError(UTAHException):
 
     """An error occurred running an adb shell command."""
 
-    def __init__(self, cmd, stdout):
+    def __init__(self, cmd, stdout, retry=True):
         Exception.__init__(self, 'ERROR: running {}'.format(cmd))
         self.cmd = cmd
         self.stdout = stdout
+        self.retry = retry
 
     def long_message(self):
         """return a long descriptive message about the error."""