[Erp5-report] r35760 rafael - /erp5/trunk/products/ERP5/tests/testBusinessTemplate.py

[nobody at svn.erp5.org]

Author: rafael
Date: Fri May 28 22:27:50 2010
New Revision: 35760

URL: http://svn.erp5.org?rev=35760&view=rev
Log:
Check if there is bt5 folder configured at instance home before the assert.

Modified:
    erp5/trunk/products/ERP5/tests/testBusinessTemplate.py

Modified: erp5/trunk/products/ERP5/tests/testBusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBusinessTemplate.py?rev=35760&r1=35759&r2=35760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] Fri May 28 22:27:50 2010
@@ -6498,8 +6498,8 @@
     url_list = [ 'https://svn.erp5.org/repos/public/erp5/trunk/bt5',
                  'http://www.erp5.org/dists/snapshot/bt5',
                  'http://www.erp5.org/dists/release/5.4.5/bt5', 
-                 'file:///opt/does/not/exist', 
-                 "INSTANCE_HOME_REPOSITORY"]
+                 "INSTANCE_HOME_REPOSITORY", 
+                 'file:///opt/does/not/exist']
     
     exist_bt5 = 'erp5_base'
     not_exist_bt5 = "erp5_not_exist"
@@ -6513,9 +6513,12 @@
                       'http://www.erp5.org/dists/snapshot/bt5/erp5_base.bt5')
     self.assertEquals(getBusinessTemplateUrl(url_list[2:], exist_bt5),
                       'http://www.erp5.org/dists/release/5.4.5/bt5/erp5_base.bt5')
-    self.assertEquals(getBusinessTemplateUrl(url_list[3:], exist_bt5), None)
-    # XXX Remains test for INSTANCE_HOME_REPOSITORY and file:/// where erp5_base
-    # exists.
+    INSTANCE_HOME = getConfiguration().instancehome
+    local_bt = None
+    if os.path.exists(INSTANCE_HOME + "/bt5/erp5_base"):
+      local_bt = 'file://' + INSTANCE_HOME + "/bt5/erp5_base"
+    self.assertEquals(getBusinessTemplateUrl(url_list[3:], exist_bt5), local_bt)
+    self.assertEquals(getBusinessTemplateUrl(url_list[4:], exist_bt5), None)
 
     # Test Not exists
     self.assertEquals(getBusinessTemplateUrl(url_list, not_exist_bt5), None)