Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
6f466e20
Commit
6f466e20
authored
Sep 01, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
selenium test slapos_monitoring_ui fix dependency
parent
1ed2f20f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
15 deletions
+7
-15
master/bt5/slapos_monitoring/bt/dependency_list
master/bt5/slapos_monitoring/bt/dependency_list
+1
-0
master/bt5/slapos_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalSlapOSMonitoring.py
...al_components/test.erp5.testFunctionalSlapOSMonitoring.py
+4
-14
master/product/SlapOS/tests/testSlapOSMixin.py
master/product/SlapOS/tests/testSlapOSMixin.py
+2
-1
No files found.
master/bt5/slapos_monitoring/bt/dependency_list
View file @
6f466e20
erp5_web
erp5_web_renderjs_ui
\ No newline at end of file
master/bt5/slapos_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalSlapOSMonitoring.py
View file @
6f466e20
...
...
@@ -27,7 +27,7 @@
import
unittest
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
threading
import
Thread
from
datetime
import
datetime
...
...
@@ -64,7 +64,7 @@ class CustomHTTPRequestHandler(SimpleHTTPRequestHandler):
def
do_HEAD
(
self
):
self
.
send_respond
()
class
TestZeleniumCore
(
ERP5TypeFunctionalTestCase
):
class
TestZeleniumCore
(
ERP5TypeFunctionalTestCase
,
testSlapOSMixin
):
foreground
=
0
run_only
=
"slapos_monitoring_ui_zuite"
base_url
=
'http://localhost:5378'
...
...
@@ -73,17 +73,6 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
httpd_is_alive
=
False
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
):
self
.
httpd
=
SocketServer
.
TCPServer
((
'localhost'
,
5378
),
CustomHTTPRequestHandler
)
self
.
httpd
.
timeout
=
2
...
...
@@ -96,7 +85,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
def
afterSetUp
(
self
):
ERP5TypeFunctionalTestCase
.
afterSetUp
(
self
)
#
testSlapOSMixin.afterSetUp(self)
testSlapOSMixin
.
afterSetUp
(
self
)
self
.
http_root_dir
=
tempfile
.
mkdtemp
()
...
...
@@ -113,6 +102,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
if
os
.
path
.
exists
(
self
.
http_root_dir
):
shutil
.
rmtree
(
self
.
http_root_dir
)
ERP5TypeFunctionalTestCase
.
beforeTearDown
(
self
)
testSlapOSMixin
.
beforeTearDown
(
self
)
def
generateInstanceDirectory
(
self
,
name
):
root_dir
=
os
.
path
.
join
(
self
.
http_root_dir
,
name
)
...
...
master/product/SlapOS/tests/testSlapOSMixin.py
View file @
6f466e20
...
...
@@ -209,8 +209,9 @@ class testSlapOSMixin(ERP5TypeTestCase):
'erp5_workflow'
,
'erp5_configurator'
,
'slapos_configurator'
,
'erp5_ui_test'
,
'slapos_monitoring'
,
'slapos_monitoring_ui_test'
,
'erp5_ui_test_core'
,
]
return
result
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment