summaryrefslogtreecommitdiff
path: root/addons/web/cli
diff options
context:
space:
mode:
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>2014-03-31 15:02:50 +0530
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>2014-03-31 15:02:50 +0530
commitad99e8cfaebd2d686d48f6d7928ebefaa852d547 (patch)
tree28f6b719c4c250b7397c6a39db260d8e91f5c023 /addons/web/cli
parent48388c9ad4d338050b065bdc0904a2a09ec225af (diff)
parentfc760dd0d03a07bf0c5833d93b3bcd7566a12e66 (diff)
[MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140331093250-wq0tgglwqvlgyw53
Diffstat (limited to 'addons/web/cli')
-rw-r--r--addons/web/cli/__init__.py1
-rw-r--r--addons/web/cli/test_js.py35
2 files changed, 0 insertions, 36 deletions
diff --git a/addons/web/cli/__init__.py b/addons/web/cli/__init__.py
deleted file mode 100644
index 823c140bb79..00000000000
--- a/addons/web/cli/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import test_js
diff --git a/addons/web/cli/test_js.py b/addons/web/cli/test_js.py
deleted file mode 100644
index b3a8e634b72..00000000000
--- a/addons/web/cli/test_js.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import logging
-import optparse
-import sys
-
-import unittest2
-
-import openerp
-import openerp.addons.web.tests
-
-_logger = logging.getLogger(__name__)
-
-class TestJs(openerp.cli.Command):
- def run(self, args):
- 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'] = config['admin_passwd']
-
- # run js tests
- openerp.netsvc.init_alternative_logger()
- suite = unittest2.TestSuite()
- suite.addTests(unittest2.TestLoader().loadTestsFromModule(openerp.addons.web.tests.test_js))
- r = unittest2.TextTestRunner(verbosity=2).run(suite)
- if r.errors or r.failures:
- sys.exit(1)
-
-# vim:et:ts=4:sw=4: