Merge lp:~camptocamp/oerpscenario/oerpscenario-odoo-8.0-erppeek-1.6b1 into lp:oerpscenario

[Yannick Vaucher @ Camptocamp]

Adds compatibility with erppeek 1.6b1 and Odoo 8.0

This issue occured:

https://bugs.launchpad.net/oerpscenario/+bug/1360152

I'm not sure from where it comes but with erppeek 1.6b1 I was only able to use a string to have a working client.

This MP should wait on https://github.com/tinyerp/erppeek/pull/55

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Moved at

https://github.com/camptocamp/oerpscenario/pull/8

Unmerged revisions

333. By Yannick Vaucher @ Camptocamp on 2014-08-22

Add compatibility with erppeek 1.6b1 and Odoo 8.0

=== modified file 'features/environment.py'
--- features/environment.py	2013-09-03 10:44:42 +0000
+++ features/environment.py	2014-08-22 13:09:03 +0000
@@ -3,8 +3,10 @@
 from support import tools, behave_better
 
 __all__ = []
-OPENERP_ARGS = '-c etc/openerp.cfg'
-OPENERP_ARGS += ' --logfile var/log/behave-stdout.log'
+OPENERP_ARGS = [
+    '-c', 'etc/openerp.cfg',
+    '--logfile=var/log/behave-stdout.log',
+    ]
 
 # Print readable 'Fault' errors
 tools.patch_traceback()
@@ -13,10 +15,21 @@
 
 
 def before_all(ctx):
-    server = erppeek.start_openerp_services(OPENERP_ARGS)
+    if erppeek.__version__ < '1.6b1':
+        server = erppeek.start_openerp_services(' '.join(OPENERP_ARGS))
+    else:
+        server = erppeek.start_odoo_services(OPENERP_ARGS)
     database = server.tools.config['db_name']
     ctx._is_context = True
-    ctx.client = erppeek.Client(server, verbose=ctx.config.verbose)
+    if erppeek.__version__ == '1.6b1':
+        # FIXME for odoo 8.0rc1 with erppeek 1.6b1 to avoid:
+        # 'AttributeError: environments'
+        # we use serverurl instead of server module
+        server_url = ('http://localhost:%s'
+                      % server.tools.config.options['xmlrpc_port'])
+        ctx.client = erppeek.Client(server_url, verbose=ctx.config.verbose)
+    else:
+        ctx.client = erppeek.Client(server, verbose=ctx.config.verbose)
     ctx.conf = {'server': server,
                 'admin_passwd': server.tools.config['admin_passwd'],
                 'db_name': database,