← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/atp-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

atp(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/atp-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)
Related bugs:
  #669868 project_planning : Failed to search user, KeyError: 'parent_id'
  https://bugs.launchpad.net/bugs/669868
  #673899 caldav : Calendar Collections : Fields in 'groupby' must appear in the list of fields to read
  https://bugs.launchpad.net/bugs/673899


1)Fixed https://bugs.launchpad.net/openobject-addons/+bug/676858.
 and document_ftp yaml.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/atp-dev-addons1/+merge/41260
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/atp-dev-addons1.
=== modified file 'document_ftp/test/document_ftp_test2.yml'
--- document_ftp/test/document_ftp_test2.yml	2010-11-03 11:26:05 +0000
+++ document_ftp/test/document_ftp_test2.yml	2010-11-19 05:26:16 +0000
@@ -271,6 +271,19 @@
         for i in range(0, 200):
             ftp.delete('test-name%s.txt' %i)
         ftp.close()
+ 
+-
+    I delete the "test.txt" and "test-renamed.txt" file        
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+        # TODO speed
+        ftp.delete('test.txt')
+        ftp.delete('test-renamed.txt')
+        ftp.close()  
+              
 -
     I remove the 'Test-Folder2'
 -

=== modified file 'document_ftp/test/document_ftp_test4.yml'
--- document_ftp/test/document_ftp_test4.yml	2010-10-27 10:23:23 +0000
+++ document_ftp/test/document_ftp_test4.yml	2010-11-19 05:26:16 +0000
@@ -82,7 +82,7 @@
 -
     I create an ir.attachment, attached (not related) to Partner1
 -
-    !record {model: ir.attachment, id: file_test1 }:
+    !record {model: ir.attachment, id: file_test1}:
         name: File of pat1
         res_model: res.partner
         res_id:  !eval ref("tpartner1")
@@ -147,10 +147,33 @@
 - |
     Bonus Piste:
     I create a 'Partner3' under 'all'
--
-    I delete the Partners Testing folder
+    
+-
+   I delete "pat1-dynamic.txt" File.
+-
+    !python {model: ir.attachment}: |
+        from document_ftp import test_easyftp as te
+        from cStringIO import StringIO
+        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
+        # TODO speed
+        ftp.delete('pat1-dynamic.txt')
+        ftp.close()        
+    
+-
+    I delete the Partners Testing folder,  "File of pat1" file, Partner and Partner category.
 -
     !python {model: document.directory}: |
+        attach_pool = self.pool.get('ir.attachment')
+        partner_categ_pool = self.pool.get('res.partner.category')
+        partner_pool =  self.pool.get('res.partner')
+        
         self.unlink(cr, uid, [ref('dir_tests2')])
         self.unlink(cr, uid, [ref('dir_respart1')])
-        cr.commit()
\ No newline at end of file
+        attach_pool.unlink(cr, uid, [ref('file_test1')])
+        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_none')])
+        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_pat1')])
+        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_all')])
+        partner_pool.unlink(cr, uid, [ref('tpartner1')])
+        partner_pool.unlink(cr, uid, [ref('tpartner_2')])
+        cr.commit()    
+    


Follow ups