Commit f27f1947 authored by Rafael Monnerat's avatar Rafael Monnerat

Split method for define pref.js content. This allow us extend/overwrite it when it is needed.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32810 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 46c1c48b
...@@ -178,9 +178,7 @@ class FunctionalTestRunner: ...@@ -178,9 +178,7 @@ class FunctionalTestRunner:
print 'Take screenshots using xwud -in %s/Xvfb_screen0' % self.xvfb_fbdir print 'Take screenshots using xwud -in %s/Xvfb_screen0' % self.xvfb_fbdir
return pid return pid
def prepareFirefox(self, host, port): def getPrefJs(self, host, port):
os.system("rm -rf %s" % self.profile_dir)
os.mkdir(self.profile_dir)
prefs_js = """ prefs_js = """
// Don't ask if we want to switch default browsers // Don't ask if we want to switch default browsers
user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.shell.checkDefaultBrowser", false);
...@@ -216,12 +214,18 @@ user_pref("signed.applets.codebase_principal_support", true); ...@@ -216,12 +214,18 @@ user_pref("signed.applets.codebase_principal_support", true);
user_pref("capability.principal.codebase.p1.id", "http://%s"); user_pref("capability.principal.codebase.p1.id", "http://%s");
user_pref("capability.principal.codebase.p1.subjectName", "");""" % \ user_pref("capability.principal.codebase.p1.subjectName", "");""" % \
'%s:%s' % (host, port) '%s:%s' % (host, port)
return prefs_js
def prepareFirefox(self, prefs_js=''):
os.system("rm -rf %s" % self.profile_dir)
os.mkdir(self.profile_dir)
pref_file = open(os.path.join(self.profile_dir, 'prefs.js'), 'w') pref_file = open(os.path.join(self.profile_dir, 'prefs.js'), 'w')
pref_file.write(prefs_js) pref_file.write(prefs_js)
pref_file.close() pref_file.close()
def runFirefox(self,xvfb_display): def runFirefox(self,xvfb_display):
self.prepareFirefox(self.host, self.port) prefs_js = self.getPrefJs(self.host, self.port)
self.prepareFirefox(prefs_js)
if self.debug: if self.debug:
try: try:
shutil.copy2(os.path.expanduser('~/.Xauthority'), '%s/.Xauthority' % self.profile_dir) shutil.copy2(os.path.expanduser('~/.Xauthority'), '%s/.Xauthority' % self.profile_dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment