Tolerate existing organisations.

d6a1af81 · Vincent Pelletier · 3dfa03c8 · d6a1af81
Commit d6a1af81 authored Dec 07, 2011 by Vincent Pelletier
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 22 deletions

product/ERP5Banking/tests/TestERP5BankingMixin.py product/ERP5Banking/tests/TestERP5BankingMixin.py +27 -22

No files found.
--- a/product/ERP5Banking/tests/TestERP5BankingMixin.py
+++ b/product/ERP5Banking/tests/TestERP5BankingMixin.py
@@ -587,30 +587,35 @@ class TestERP5BankingMixin(ERP5TypeTestCase):
          created_site_list.append(site)
    # Create organisation + bank account for each site category.
-    newContent = self.organisation_module.newContent
+    organisation_module = self.organisation_module
+    newContent = organisation_module.newContent
    for site in created_site_list:
      codification = site.getCodification()
-      organisation = newContent(
+      organisation_id = 'site_%s' % (codification, )
-        portal_type='Organisation',
+      try:
-        id='site_%s' % (codification, ),
+        organisation_module[organisation_id]
-        site=site.getRelativeUrl(),
+      except KeyError:
-        region=site_region_from_codification_dict.get(codification),
+        organisation = newContent(
-        group='baobab',
+          portal_type='Organisation',
-        role='internal',
+          id=organisation_id,
-        function='banking')
+          site=site.getRelativeUrl(),
-      site_reference = site_reference_from_codification_dict.get(codification)
+          region=site_region_from_codification_dict.get(codification),
-      if site_reference is not None:
+          group='baobab',
-        self.createBankAccount(
+          role='internal',
-          person=organisation,
+          function='banking')
-          account_id='account_%s' % (codification, ),
+        site_reference = site_reference_from_codification_dict.get(codification)
-          currency=self.currency_1,
+        if site_reference is not None:
-          amount=0,
+          self.createBankAccount(
-          bank_country_code=site_reference[0],
+            person=organisation,
-          bank_code=site_reference[1],
+            account_id='account_%s' % (codification, ),
-          branch=site_reference[2],
+            currency=self.currency_1,
-          bank_account_number=site_reference[3],
+            amount=0,
-          bank_account_key=site_reference[4],
+            bank_country_code=site_reference[0],
-        )
+            bank_code=site_reference[1],
+            branch=site_reference[2],
+            bank_account_number=site_reference[3],
+            bank_account_key=site_reference[4],
+          )
    self.vault_type_base_category = getattr(self.category_tool, 'vault_type')
    site_vault_type = self._maybeNewContent(self.vault_type_base_category, id='site')