From ad089d7e82a43ef317b77fa2a85ec80ae0f2a9ee Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 9 Apr 2013 18:22:14 -0400 Subject: [PATCH] Backed out changeset 3f8a9cfdc055 (bug 857599) for Mn failures on a CLOSED TREE. --- .../marionette/client/marionette/geckoinstance.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/testing/marionette/client/marionette/geckoinstance.py b/testing/marionette/client/marionette/geckoinstance.py index 6481c95e91c..a83f657fdd6 100644 --- a/testing/marionette/client/marionette/geckoinstance.py +++ b/testing/marionette/client/marionette/geckoinstance.py @@ -2,7 +2,6 @@ # 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/ -from mozprofile import Profile from mozrunner import Runner @@ -25,11 +24,11 @@ class GeckoInstance(object): if not profile_path: profile_args["restore"] = False else: - profile_args["path_from"] = profile_path + profile_args["profile"] = profile_path print "starting runner" - self.runner = CloneRunner.create(binary=self.bin, - profile_args=profile_args, - cmdargs=['-no-remote']) + self.runner = Runner.create(binary=self.bin, + profile_args=profile_args, + cmdargs=['-no-remote']) self.runner.start() def close(self): @@ -42,8 +41,3 @@ class B2GDesktopInstance(GeckoInstance): required_prefs = {"focusmanager.testmode": True} apps = {'b2gdesktop': B2GDesktopInstance} - - -class CloneRunner(Runner): - - profile_class = Profile.clone