Backed out changeset 6baeffddba47 (bug 1060279) for regressions
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 02 Sep 2014 13:56:44 +0200
changeset 202977 bb6876120191ca14dea7500609d2c1cebddac39c
parent 202976 e567693fa55fa2a072606b7faeecfad4798d83c5
child 202978 c98b1e8ca69a2ced2e5175044b185270882bdeb7
push id48539
push usercbook@mozilla.com
push dateTue, 02 Sep 2014 11:57:00 +0000
treeherdermozilla-inbound@bb6876120191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1060279
milestone34.0a1
backs out6baeffddba47cf0c1b4256a2cd8db79e8e6e36e0
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 6baeffddba47 (bug 1060279) for regressions
testing/marionette/client/marionette/runner/mixins/b2g.py
--- a/testing/marionette/client/marionette/runner/mixins/b2g.py
+++ b/testing/marionette/client/marionette/runner/mixins/b2g.py
@@ -38,17 +38,17 @@ class B2GTestCaseMixin(object):
     # TODO: add methods like 'restart b2g'
     def __init__(self, *args, **kwargs):
         self._device_manager = None
 
     def get_device_manager(self, *args, **kwargs):
         capabilities = self.marionette.session and \
             self.marionette.session_capabilities or {}
         if not self._device_manager and \
-                capabilities.get('platform').lower() == 'android':
+                capabilities.get('device') != 'desktop':
             self._device_manager = get_dm(self.marionette, **kwargs)
         return self._device_manager
 
     @property
     def device_manager(self):
         return self.get_device_manager()