Merge lp:~camptocamp/oerpscenario/fix-create-db-odoo-8 into lp:oerpscenario

[Yannick Vaucher @ Camptocamp]

[lp:~camptocamp/oerpscenario/fix-create-db-odoo-8]

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

do log user in before_scenario in order to be able, with a tag @no_login, to execute action without trying to log. It can be useful to repair a database or to create the database before logging in.

[Leonardo Pistone (lepistone)]

1. you could take the occasion to refactor the original code in

admin_login_password = xxx.get('yyy') or 'admin'

and remove the "if" block

2. the commit message is unclear to me, you mean "do NOT log user in" ?

3. the new commentary sound also a bit obscure but maybe it's only me :)

4. not 'no_login' in -> 'no_login' not in

thanks

review: Needs Fixing

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Moved on github:

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

Unmerged revisions

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

do log user in before_scenario in order to be able, with a tag @no_login, to execute action without trying to log. It can be useful to repair a database or to create the database before logging in.

=== modified file 'features/environment.py'
--- features/environment.py	2013-09-03 10:44:42 +0000
+++ features/environment.py	2014-08-22 17:05:01 +0000
@@ -22,26 +22,31 @@
                 'db_name': database,
                 'openerp_config': server.tools.config,
                 }
-    # We try to manage default login
-    # even if there is a sentence to log a given user
-    # Just add options.admin_login_password in your buildout to log from config
-    admin_login_password = server.tools.config.get('admin_login_password')
-    if admin_login_password:
-        ctx.client.login('admin', admin_login_password, database=database)
-    else:
-        ctx.client.login('admin', 'admin', database=database)
+
 
 
 def before_feature(ctx, feature):
     #pdb.set_trace()
     ctx.data = {}
 
-
 # Work around https://github.com/behave/behave/issues/145
 def before_scenario(ctx, scenario):
     if not hasattr(ctx, 'data'):
         ctx.data = {}
-
+    # login if not done only then
+    # this in order to be able to create database first
+    # and / or execute some sql requests
+    if not ctx.client.user and not 'no_login' in scenario.tags:
+        server = ctx.conf['server']
+        database = ctx.conf['db_name']
+        # We try to manage default login
+        # even if there is a sentence to log a given user
+        # Just add options.admin_login_password in your buildout to log from config
+        admin_login_password = server.tools.config.get('admin_login_password')
+        if admin_login_password:
+            ctx.client.login('admin', admin_login_password, database=database)
+        else:
+            ctx.client.login('admin', 'admin', database=database)
 
 def before_step(ctx, step):
     #pdb.set_trace()