Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1389999 - Check the existence of ProfileStorage before running tests in test_refresh_firefox.py. r=MattN

Browse Source 
MozReview-Commit-ID: B0DtEZD3We1

--HG--
extra : rebase_source : b2c891d78c23ee469b96d2d0157d236791dc1123
This commit is contained in:
Luke Chang 2017-08-24 14:53:02 +08:00
parent c946e3ebb0
commit 5bc80fb017
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
browser/components/migration/tests/marionette/test_refresh_firefox.py
View File

@ -25,6 +25,7 @@ class TestFirefoxRefresh(MarionetteTestCase):
_formHistoryFieldName = "some-very-unique-marionette-only-firefox-reset-field"
_formHistoryValue = "special-pumpkin-value"
_formAutofillAvailable = False
_formAutofillAddressGuid = None
_expectedURLs = ["about:robots", "about:mozilla"]
@ -104,6 +105,8 @@ class TestFirefoxRefresh(MarionetteTestCase):
print error
def createFormAutofill(self):
if not self._formAutofillAvailable:
return
self._formAutofillAddressGuid = self.runAsyncCode("""
const TEST_ADDRESS_1 = {
"given-name": "John",
@ -248,6 +251,9 @@ class TestFirefoxRefresh(MarionetteTestCase):
self.assertEqual(formHistoryCount, 1, "There should be only 1 entry in the form history")
def checkFormAutofill(self):
if not self._formAutofillAvailable:
return
formAutofillResults = self.runAsyncCode("""
return global.profileStorage.initialize().then(() => {
return global.profileStorage.addresses.getAll()
@ -357,7 +363,14 @@ class TestFirefoxRefresh(MarionetteTestCase):
global.profSvc = Cc["@mozilla.org/toolkit/profile-service;1"].getService(Ci.nsIToolkitProfileService);
global.Preferences = Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
global.FormHistory = Cu.import("resource://gre/modules/FormHistory.jsm", {}).FormHistory;
global.profileStorage = Cu.import("resource://formautofill/ProfileStorage.jsm", {}).profileStorage;
""")
self._formAutofillAvailable = self.runCode("""
try {
global.profileStorage = Cu.import("resource://formautofill/ProfileStorage.jsm", {}).profileStorage;
} catch(e) {
return false;
}
return true;
""")
def runCode(self, script, *args, **kwargs):