Bug 783132 - bump mozprocess dep and add call to processOutput, r=ahal, DONTBUILD because NPOTB
authorJonathan Griffin <jgriffin@mozilla.com>
Thu, 16 Aug 2012 10:59:47 -0700
changeset 104535 136209f365134f57ff420b54be8c8c4c5b0ea3b6
parent 104534 75f67ed39ebda44f8c87147279f251319b209870
child 104536 d5fab9ef16a4cf45728c03bf6f2b77ea54ee3600
push id45
push usershu@rfrn.org
push dateThu, 23 Aug 2012 00:57:43 +0000
reviewersahal, DONTBUILD
bugs783132
milestone17.0a1
Bug 783132 - bump mozprocess dep and add call to processOutput, r=ahal, DONTBUILD because NPOTB
testing/marionette/client/marionette/emulator.py
testing/marionette/client/setup.py
--- a/testing/marionette/client/marionette/emulator.py
+++ b/testing/marionette/client/marionette/emulator.py
@@ -281,16 +281,17 @@ class Emulator(object):
 
         # setup DNS fix for networking
         self._run_adb(['-s', 'emulator-%d' % self.port,
                        'shell', 'setprop', 'net.dns1', '10.0.2.3'])
 
     def _save_logcat_proc(self, filename, cmd):
         self.logcat_proc = LogcatProc(filename, cmd)
         self.logcat_proc.run()
+        self.logcat_proc.processOutput()
         self.logcat_proc.waitForFinish()
         self.logcat_proc = None
 
     def rotate_log(self, srclog, index=1):
         """ Rotate a logfile, by recursively rotating logs further in the sequence,
             deleting the last file if necessary.
         """
         destlog = os.path.join(self.logcat_dir, 'emulator-%d.%d.log' % (self.port, index))
--- a/testing/marionette/client/setup.py
+++ b/testing/marionette/client/setup.py
@@ -6,17 +6,18 @@ version = '0.3'
 # get documentation from the README
 try:
     here = os.path.dirname(os.path.abspath(__file__))
     description = file(os.path.join(here, 'README.md')).read()
 except (OSError, IOError):
     description = ''
 
 # dependencies
-deps = ['manifestdestiny', 'mozhttpd >= 0.3', 'mozrunner', 'datazilla == 0.2.1']
+deps = ['manifestdestiny', 'mozhttpd >= 0.3',
+        'mozprocess == 0.5', 'mozrunner == 5.10', 'datazilla == 0.2.1']
 
 setup(name='marionette',
       version=version,
       description="Marionette test automation client",
       long_description=description,
       classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='mozilla',
       author='Jonathan Griffin',