From e95ac795adbd9376e435a23f9feed84ff8efffd9 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 2 Sep 2014 13:56:44 +0200 Subject: [PATCH] Backed out changeset 6baeffddba47 (bug 1060279) for regressions --- testing/marionette/client/marionette/runner/mixins/b2g.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/marionette/client/marionette/runner/mixins/b2g.py b/testing/marionette/client/marionette/runner/mixins/b2g.py index 0adbc30f0725..129fb882c4f7 100644 --- a/testing/marionette/client/marionette/runner/mixins/b2g.py +++ b/testing/marionette/client/marionette/runner/mixins/b2g.py @@ -43,7 +43,7 @@ class B2GTestCaseMixin(object): 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