Bug 860108 - Clone starting repo for b2g desktop mochitests, r=ahal
authorJonathan Griffin <jgriffin@mozilla.com>
Tue, 09 Apr 2013 17:13:32 -0700
changeset 128530 7095efa510c27fae2e59aa503aef04c3a7db2473
parent 128529 2b504b52c50b82ea5d82bdb7008088f53d9c7f12
child 128531 caede81ef8cfa4d3f3277b7ad25bfb60c6ff0f8c
push id26370
push userjgriffin@mozilla.com
push dateFri, 12 Apr 2013 00:34:52 +0000
treeherdermozilla-inbound@7095efa510c2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs860108
milestone23.0a1
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
Bug 860108 - Clone starting repo for b2g desktop mochitests, r=ahal
testing/mochitest/runtestsb2g.py
--- a/testing/mochitest/runtestsb2g.py
+++ b/testing/mochitest/runtestsb2g.py
@@ -125,21 +125,28 @@ container.src = '%s';
 
         # interpolate the preferences
         interpolation = { "server": "%s:%s" % (options.webServer, options.httpPort),
                           "OOP": "true" if self.OOP else "false" }
         prefs = json.loads(json.dumps(prefs) % interpolation)
         for pref in prefs:
             prefs[pref] = Preferences.cast(prefs[pref])
 
-        self.profile = Profile(addons=self.getExtensionsToInstall(options),
-                               apps=self.webapps,
-                               locations=self.locations,
-                               preferences=prefs,
-                               proxy={"remote": options.webServer})
+        kwargs = {
+            'addons': self.getExtensionsToInstall(options),
+            'apps': self.webapps,
+            'locations': self.locations,
+            'preferences': prefs,
+            'proxy': {"remote": options.webServer}
+        }
+
+        if options.profile:
+            self.profile = Profile.clone(options.profile, **kwargs)
+        else:
+            self.profile = Profile(**kwargs)
 
         options.profilePath = self.profile.profile
         # TODO bug 839108 - mozprofile should probably handle this
         manifest = self.addChromeToProfile(options)
         self.copyExtraFilesToProfile(options)
         return manifest