Bug 647414 - Distributed extensions should be automatically installed into temporary testing profile; (Cv1) Add ipc-overlay.xul to SeaMonkey too.

r=jmaher.
This commit is contained in:
Serge Gautherie 2011-04-18 18:50:04 +02:00
Родитель d9518f9287
Коммит ae421aa19d
1 изменённых файлов: 11 добавлений и 6 удалений

Просмотреть файл

@ -723,21 +723,26 @@ toolbar#nav-bar {
self.automation.log.warning("TEST-UNEXPECTED-FAIL | invalid setup: missing mochikit extension") self.automation.log.warning("TEST-UNEXPECTED-FAIL | invalid setup: missing mochikit extension")
return None return None
browser_chrome = "" # Support Firefox (browser) and SeaMonkey (navigator).
chrome = ""
if options.browserChrome: if options.browserChrome:
browser_chrome = """overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul chrome += """
overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-test-overlay.xul overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-test-overlay.xul
overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul
""" """
elif (options.chrome == False) and (options.a11y == False): elif (options.chrome == False) and (options.a11y == False):
#only do the ipc-overlay.xul for mochitest-plain. #only do the ipc-overlay.xul for mochitest-plain.
#Currently there are focus issues in chrome tests and issues with new windows and dialogs when using ipc #Currently there are focus issues in chrome tests and issues with new windows and dialogs when using ipc
browser_chrome += "overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul\n" chrome += """
overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul
overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/ipc-overlay.xul
"""
self.installChromeJar(jarDir, browser_chrome, options) self.installChromeJar(jarDir, chrome, options)
return manifest return manifest
def installChromeJar(self, jarDirName, browser_chrome, options): def installChromeJar(self, jarDirName, chrome, options):
""" """
copy mochijar directory to profile as an extension so we have chrome://mochikit for all harness code copy mochijar directory to profile as an extension so we have chrome://mochikit for all harness code
""" """
@ -746,7 +751,7 @@ overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-t
# Write chrome.manifest. # Write chrome.manifest.
with open(os.path.join(options.profilePath, "extensions", "mochikit@mozilla.org", "chrome.manifest"), "a") as mfile: with open(os.path.join(options.profilePath, "extensions", "mochikit@mozilla.org", "chrome.manifest"), "a") as mfile:
mfile.write(browser_chrome) mfile.write(chrome)
def copyTestsJarToProfile(self, options): def copyTestsJarToProfile(self, options):
""" copy tests.jar to the profile directory so we can auto register it in the .xul harness """ """ copy tests.jar to the profile directory so we can auto register it in the .xul harness """