Commit 6f466e20 authored by Alain Takoudjou's avatar Alain Takoudjou

selenium test slapos_monitoring_ui fix dependency

parent 1ed2f20f
erp5_web
erp5_web_renderjs_ui erp5_web_renderjs_ui
\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
import unittest import unittest
from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctionalTestCase from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctionalTestCase
# from Products.SlapOS.tests.testSlapOSMixin import testSlapOSMixin from Products.SlapOS.tests.testSlapOSMixin import testSlapOSMixin
from SimpleHTTPServer import SimpleHTTPRequestHandler from SimpleHTTPServer import SimpleHTTPRequestHandler
from threading import Thread from threading import Thread
from datetime import datetime from datetime import datetime
...@@ -64,7 +64,7 @@ class CustomHTTPRequestHandler(SimpleHTTPRequestHandler): ...@@ -64,7 +64,7 @@ class CustomHTTPRequestHandler(SimpleHTTPRequestHandler):
def do_HEAD(self): def do_HEAD(self):
self.send_respond() self.send_respond()
class TestZeleniumCore(ERP5TypeFunctionalTestCase): class TestZeleniumCore(ERP5TypeFunctionalTestCase, testSlapOSMixin):
foreground = 0 foreground = 0
run_only = "slapos_monitoring_ui_zuite" run_only = "slapos_monitoring_ui_zuite"
base_url = 'http://localhost:5378' base_url = 'http://localhost:5378'
...@@ -73,17 +73,6 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase): ...@@ -73,17 +73,6 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
httpd_is_alive = False httpd_is_alive = False
root_title = "TEST Hosting Subscription" root_title = "TEST Hosting Subscription"
def getBusinessTemplateList(self):
"""
Install the business templates.
"""
result = [
'slapos_monitoring',
'slapos_monitoring_ui_test',
'erp5_ui_test_core',
]
return result
def start_httpd_server(self, root_folder): def start_httpd_server(self, root_folder):
self.httpd = SocketServer.TCPServer(('localhost', 5378), CustomHTTPRequestHandler) self.httpd = SocketServer.TCPServer(('localhost', 5378), CustomHTTPRequestHandler)
self.httpd.timeout = 2 self.httpd.timeout = 2
...@@ -96,7 +85,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase): ...@@ -96,7 +85,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
def afterSetUp(self): def afterSetUp(self):
ERP5TypeFunctionalTestCase.afterSetUp(self) ERP5TypeFunctionalTestCase.afterSetUp(self)
#testSlapOSMixin.afterSetUp(self) testSlapOSMixin.afterSetUp(self)
self.http_root_dir = tempfile.mkdtemp() self.http_root_dir = tempfile.mkdtemp()
...@@ -113,6 +102,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase): ...@@ -113,6 +102,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
if os.path.exists(self.http_root_dir): if os.path.exists(self.http_root_dir):
shutil.rmtree(self.http_root_dir) shutil.rmtree(self.http_root_dir)
ERP5TypeFunctionalTestCase.beforeTearDown(self) ERP5TypeFunctionalTestCase.beforeTearDown(self)
testSlapOSMixin.beforeTearDown(self)
def generateInstanceDirectory(self, name): def generateInstanceDirectory(self, name):
root_dir = os.path.join(self.http_root_dir, name) root_dir = os.path.join(self.http_root_dir, name)
......
...@@ -209,8 +209,9 @@ class testSlapOSMixin(ERP5TypeTestCase): ...@@ -209,8 +209,9 @@ class testSlapOSMixin(ERP5TypeTestCase):
'erp5_workflow', 'erp5_workflow',
'erp5_configurator', 'erp5_configurator',
'slapos_configurator', 'slapos_configurator',
'erp5_ui_test',
'slapos_monitoring',
'slapos_monitoring_ui_test', 'slapos_monitoring_ui_test',
'erp5_ui_test_core',
] ]
return result return result
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment