mozilla-central: changeset 277387:7d2475c0d623ac04fa518e56f19a449a531867f1

author	Nigel Babu <nigelbabu@gmail.com>
	Tue, 22 Dec 2015 20:02:11 +0530
changeset 277387	7d2475c0d623ac04fa518e56f19a449a531867f1
parent 277386	a0d6ae2f0ec3124d80344a057fc3c4659d8a6568
child 277388	6e4e4e058354217e800a686d61b0c30bfcfe6999
push id	29822
push user	cbook@mozilla.com
push date	Wed, 23 Dec 2015 11:00:24 +0000
treeherder	mozilla-central@35b211eaad1f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ahal
bugs	1208725
milestone	46.0a1
first release with	nightly linux32 35b211eaad1f / 46.0a1 / 20151225030207 / files nightly linux64 35b211eaad1f / 46.0a1 / 20151225030207 / files nightly mac 35b211eaad1f / 46.0a1 / 20151225030207 / files nightly win32 35b211eaad1f / 46.0a1 / 20151225030207 / files nightly win64 35b211eaad1f / 46.0a1 / 20151225030207 / files
last release without	nightly linux32 ad16863d1d45 / 46.0a1 / 20151222030207 / files nightly linux64 ad16863d1d45 / 46.0a1 / 20151222030207 / files nightly mac ad16863d1d45 / 46.0a1 / 20151222030207 / files nightly win32 ad16863d1d45 / 46.0a1 / 20151222030207 / files nightly win64 ad16863d1d45 / 46.0a1 / 20151222030207 / files

--- a/testing/mochitest/runtestsb2g.py
+++ b/testing/mochitest/runtestsb2g.py
@@ -138,16 +138,18 @@ class MochitestB2G(MochitestBase):
                         self.runner.last_test = message['test']
 
             # The logging will be handled by on_output, so we set the stream to
             # None
             process_args = {'processOutputLine': on_output,
                             'stream': None}
             self.marionette_args['process_args'] = process_args
             self.marionette_args['profile'] = self.profile
+            # Increase the timeout to fix bug 1208725
+            self.marionette_args['socket_timeout'] = 720
 
             self.marionette = Marionette(**self.marionette_args)
             self.runner = self.marionette.runner
             self.app_ctx = self.runner.app_ctx
 
             self.remote_log = posixpath.join(self.app_ctx.remote_test_root,
                                              'log', 'mochitest.log')
             if not self.app_ctx.dm.dirExists(