Bug 1026259 - Don't throw if wait_for_net fails before rebooting, r=jgraham, a=test-only
authorJonathan Griffin <jgriffin@mozilla.com>
Mon, 30 Jun 2014 10:32:30 -0700
changeset 208680 afea0cb928b529d194ec7a96fabbe6aa3b1280b3
parent 208679 e2b455dd98dc55f333974ff5954ea1e8a01534fb
child 208681 8376d4b991acb07919833de6befcec251222b14d
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgraham, test-only
bugs1026259
milestone32.0a2
Bug 1026259 - Don't throw if wait_for_net fails before rebooting, r=jgraham, a=test-only
testing/mozbase/mozrunner/mozrunner/remote.py
testing/mozbase/mozrunner/setup.py
--- a/testing/mozbase/mozrunner/mozrunner/remote.py
+++ b/testing/mozbase/mozrunner/mozrunner/remote.py
@@ -163,17 +163,17 @@ class B2GRunner(RemoteRunner):
         cmd.append('/system/bin/b2g.sh')
         return cmd
 
     def start(self, timeout=None, outputTimeout=None):
         self.timeout = timeout
         self.outputTimeout = outputTimeout
 
         if not self._wait_for_net():
-            raise Exception("network not available, unable to start")
+            self.log.info("wait_for_net failed before restarting, continuing anyway")
 
         self._setup_remote_profile()
         # reboot device so it starts up with the proper profile
         if not self.emulator:
             self.dm.reboot(wait=True)
             #wait for wlan to come up
             if not self._wait_for_net():
                 raise Exception("network did not come up, please configure the network" +
--- a/testing/mozbase/mozrunner/setup.py
+++ b/testing/mozbase/mozrunner/setup.py
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 from setuptools import setup
 
 PACKAGE_NAME = 'mozrunner'
-PACKAGE_VERSION = '5.37.1'
+PACKAGE_VERSION = '5.37.2'
 
 desc = """Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"""
 
 deps = ['mozcrash >= 0.11',
         'mozdevice >= 0.30',
         'mozfile >= 1.0',
         'mozinfo >= 0.7',
         'mozlog >= 1.5',