[Erp5-report] r32810 rafael - /erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py

[nobody at svn.erp5.org]

Author: rafael
Date: Thu Feb 18 19:35:19 2010
New Revision: 32810

URL: http://svn.erp5.org?rev=32810&view=rev
Log:
Split method for define pref.js content. This allow us extend/overwrite it when it is needed.

Modified:
    erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py

Modified: erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py?rev=32810&r1=32809&r2=32810&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runFunctionalTest.py [utf8] Thu Feb 18 19:35:19 2010
@@ -177,10 +177,8 @@
     print 'Xvfb : %d' % pid
     print 'Take screenshots using xwud -in %s/Xvfb_screen0' % self.xvfb_fbdir
     return pid
-  
-  def prepareFirefox(self, host, port):
-    os.system("rm -rf %s" % self.profile_dir)
-    os.mkdir(self.profile_dir)
+
+  def getPrefJs(self, host, port):
     prefs_js = """
 // Don't ask if we want to switch default browsers
 user_pref("browser.shell.checkDefaultBrowser", false);
@@ -216,12 +214,18 @@
 user_pref("capability.principal.codebase.p1.id", "http://%s");
 user_pref("capability.principal.codebase.p1.subjectName", "");""" % \
       '%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.write(prefs_js)
     pref_file.close()
   
   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:
       try:
         shutil.copy2(os.path.expanduser('~/.Xauthority'), '%s/.Xauthority' % self.profile_dir)