← Back to branch summary

~therp-nl/anybox.recipe.openerp/jbaudoux-relative_paths_resolve_conflict

« back to all changes in this revision

Viewing changes to anybox/recipe/openerp/tests/test_server.py

[MRG] Update with target branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
anybox/recipe/openerp/tests/test_server.py
251
251
        self.recipe.retrieve_addons()
252
252
        paths = self.recipe.addons_paths
253
253
        self.recipe.finalize_addons_paths(check_existence=False)
254
 
        self.assertEquals(paths, [addons_dir,
255
 
                                  os.path.join(oerp_dir, 'openerp', 'addons')])
 
254
        self.assertEquals(paths, [os.path.join(oerp_dir, 'openerp', 'addons'),
 
255
                                  addons_dir])
256
256
 
257
257
    def test_retrieve_fixup_addons_local_60_check_ok(self):
258
258
        oerp_dir = os.path.join(TEST_DIR, 'oerp60')
268
268
        os.mkdir(addons_dir)
269
269
        self.recipe.finalize_addons_paths()
270
270
        paths = self.recipe.addons_paths
271
 
        self.assertEqual(paths, [addons_dir, root_dir])
 
271
        self.assertEqual(paths, [root_dir, addons_dir])
272
272
        self.assertEqual(self.recipe.options['options.root_path'],
273
273
                         os.path.join(oerp_dir, 'bin'))
274
274