Changeset 6282 for main/waeup.sirp/trunk/src/waeup

Timestamp:

4 Jun 2011, 14:01:57 (14 years ago)

Author:

uli

Message:

Fix batching of applicants containers.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• batching.py (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/batching.py

@@ -42 +42 @@
 
     location_fields = ['code',]
-    factory_name = 'waeup.ApplicantContainer'
+    factory_name = 'waeup.ApplicantsContainer'
 
     def parentsExist(self, row, site):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_batching.py

@@ -119 +119 @@
     def test_import(self):
         # Do a real import
+        # see local sample_container.csv file for input
         self.importer.doImport(
             self.csv_file, APPS_CONTAINER_HEADER_FIELDS)
-        #print self.workdir
-        #import pdb; pdb.set_trace()
-
-        # This currently gives:
-        #
-        # ac_prefix,code,application_category,provider,prefix,year,--ERRORS--
-        # APP,CODE1,app,base,app,2013,"conversion error: field application_category: <type 'exceptions.LookupError'> LookupError('app',) / conversion error: field provider: <type 'exceptions.TypeError'> TypeError('unhashable type',)"
-        # DPP,CODE2,dp,base,app,2013,"conversion error: field application_category: <type 'exceptions.LookupError'> LookupError('dp',) / conversion error: field provider: <type 'exceptions.TypeError'> TypeError('unhashable type',)"
-        self.assertTrue(u'CODE1' in self.app['applicants'].keys())
+        avail_containers = [x for x in self.app['applicants'].keys()]
+        self.assertTrue(u'CODE1' in avail_containers)
+        self.assertTrue(u'CODE2' in avail_containers)
 
 def test_suite():