Merge lp:~therp-nl/ocb-server/7.0-lp1194893-fix_tests into lp:ocb-server

[Stefan Rijnhart (Opener)]

[FIX] Generates external ids based on the actual model's name in the case of relation fields

This branch fixes a failing test due to the fix for lp:1194893. This fix generates external ids based on the actual model's name in the case of relation fields. The failing test expected to find the source model's name in the external id, not the m2o target model name.

======================================================================
FAIL: test_external_id (openerp.addons.test_impex.tests.test_export.test_m2o)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/oerstfdev70/openobject-server/openerp/tests/addons/test_impex/tests/test_export.py", line 316, in test_external_id
    [[external_id]])
AssertionError: Lists differ: [[u'__export__.export_integer_... != [[u'__export__.export_many2one...

First differing element 0:
[u'__export__.export_integer_65']
[u'__export__.export_many2one_65']

- [[u'__export__.export_integer_65']]
? ^ ^ ---

+ [[u'__export__.export_many2one_65']]
? ^^ ^^^^

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

Stefan, it's good to see that you are already working of fixing tests problems.

Thank you for your always valuable work.

Regards.

review: Approve (code review, no test)

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Christophe CHAUVET (christophe-chauvet)]

Hi

Explanation is OK for me

Regards,

LGTM

review: Approve (code review, no test)

=== modified file 'openerp/tests/addons/test_impex/tests/test_export.py'
--- openerp/tests/addons/test_impex/tests/test_export.py	2012-09-07 12:08:04 +0000
+++ openerp/tests/addons/test_impex/tests/test_export.py	2013-10-24 21:52:26 +0000
@@ -309,8 +309,9 @@
     def test_external_id(self):
         integer_id = self.registry('export.integer').create(
             self.cr, openerp.SUPERUSER_ID, {'value': 42})
-        # __export__.$class.$id
-        external_id = u'__export__.export_many2one_%d' % integer_id
+        # Expecting the m2o target model name in the external id,
+        # not this model's name
+        external_id = u'__export__.export_integer_%d' % integer_id
         self.assertEqual(
             self.export(integer_id, fields=['value/id']),
             [[external_id]])