[FIX] runbot use db_password for admin_passowrd

bzr revid: al@openerp.com-20121209040103-65om8phyuj71u167

addons/web/cli/test_js.py

@@ -14,11 +14,15 @@ class TestJs(openerp.cli.Command):
         self.parser = parser = optparse.OptionParser()
         parser.add_option("-d", "--database", dest="db_name", default=False, help="specify the database name")
         parser.add_option("--xmlrpc-port", dest="xmlrpc_port", default=8069, help="specify the TCP port for the XML-RPC protocol", type="int")
+        # proably need to add both --superadmin-password and --database-admin-password
         self.parser.parse_args(args)
 
         # test ony uses db_name xmlrpc_port admin_passwd, so use the server one for the actual parsing
+
         config = openerp.tools.config
         config.parse_config(args)
+        # needed until runbot is fixed
+        config['db_password'] = tools.config['admin_passwd']
 
         # run js tests
         openerp.netsvc.init_alternative_logger()

addons/web/tests/test_js.py

@@ -14,6 +14,10 @@ class WebSuite(QUnitSuite):
                 # password for postgres and should not appear here of that i'm
                 # sure
                 supadmin=tools.config['admin_passwd'] or 'admin',
+                #
+                # But runbot provides it with this wrong key so i let it here
+                # until it's fixed
+                supadmin=tools.config['db_password'] or 'admin',
                 password=tools.config['admin_passwd'] or 'admin'),
             ''
         ])