[IMP] rename into test_ui like addons

bzr revid: al@openerp.com-20140209231948-5tqj0nndsod0gyb1

6 files changed, 5 insertions, 15 deletions

diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py
index 29e1040beba..6358dffa45b 100644
--- a/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@ -15,12 +15,12 @@ import test_mail
 import test_menu
 import test_orm
 import test_osv
-import test_phantom
 import test_qweb
 import test_res_config
 import test_res_lang
 import test_search
 import test_translate
+import test_ui
 #import test_uninstall
 import test_view_validation
 import test_views
diff --git a/openerp/addons/base/tests/test_phantom_run_admin.js b/openerp/addons/base/tests/test_phantom_run_admin.js
deleted file mode 100644
index 8e684eff66d..00000000000
--- a/openerp/addons/base/tests/test_phantom_run_admin.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Load helper
-phantom.injectJs(phantom.args[0]);
-
-pt = new PhantomTest();
-pt.run_admin("/", "console.log('ok')", "console");
-
diff --git a/openerp/addons/base/tests/test_phantom.py b/openerp/addons/base/tests/test_ui.py
index 2e73a20c783..49384662163 100644
--- a/openerp/addons/base/tests/test_phantom.py
+++ b/openerp/addons/base/tests/test_ui.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-
 import os
 import glob
 
 import openerp
 
-class test_phantom(openerp.tests.HttpCase):
-    def test_phantom(self):
-        fname, _ = os.path.splitext(__file__)
+fname, _ = os.path.splitext(__file__)
+
+class TestUi(openerp.tests.HttpCase):
+    def test(self):
         for i in glob.glob('%s*.js' % fname):
             self.phantomjs(openerp.modules.module.get_module_resource('base','tests', i))
 
diff --git a/openerp/addons/base/tests/test_phantom_hello.js b/openerp/addons/base/tests/test_ui_hello.js
index 6a453e947aa..6a453e947aa 100644
--- a/openerp/addons/base/tests/test_phantom_hello.js
+++ b/openerp/addons/base/tests/test_ui_hello.js
diff --git a/openerp/addons/base/tests/test_phantom_run.js b/openerp/addons/base/tests/test_ui_run.js
index 77277a635ce..77277a635ce 100644
--- a/openerp/addons/base/tests/test_phantom_run.js
+++ b/openerp/addons/base/tests/test_ui_run.js
diff --git a/openerp/addons/base/tests/test_xmlrpc.py b/openerp/addons/base/tests/test_xmlrpc.py
index 00be7e78df5..ab1d3821c40 100644
--- a/openerp/addons/base/tests/test_xmlrpc.py
+++ b/openerp/addons/base/tests/test_xmlrpc.py
@@ -33,8 +33,4 @@ class test_xmlrpc(common.HttpCase):
     #    with self.assertRaisesRegexp(Exception, msg_re):
     #        self.proxy.edi_60.import_edi_document(DB, ADMIN_USER_ID, ADMIN_PASSWORD, {})
 
-if __name__ == '__main__':
-    unittest2.main()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: