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
Labels
Merge Requests
19
Merge Requests
19
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
09c26248
Commit
09c26248
authored
Oct 24, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Setup things only once.
parent
ff733d03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
9 deletions
+3
-9
master/product/SlapOS/tests/testSlapOSMixin.py
master/product/SlapOS/tests/testSlapOSMixin.py
+0
-2
master/product/Vifib/tests/VifibMixin.py
master/product/Vifib/tests/VifibMixin.py
+3
-7
No files found.
master/product/SlapOS/tests/testSlapOSMixin.py
View file @
09c26248
...
@@ -33,8 +33,6 @@ import Products.Vifib.tests.VifibMixin
...
@@ -33,8 +33,6 @@ import Products.Vifib.tests.VifibMixin
class
testSlapOSMixin
(
Products
.
Vifib
.
tests
.
VifibMixin
.
testVifibMixin
):
class
testSlapOSMixin
(
Products
.
Vifib
.
tests
.
VifibMixin
.
testVifibMixin
):
def
afterSetUp
(
self
):
def
afterSetUp
(
self
):
self
.
setupPortalCertificateAuthority
()
self
.
setUpMemcached
()
self
.
portal
.
portal_caches
.
erp5_site_global_id
=
'%s'
%
random
.
random
()
self
.
portal
.
portal_caches
.
erp5_site_global_id
=
'%s'
%
random
.
random
()
self
.
portal
.
portal_caches
.
_p_changed
=
1
self
.
portal
.
portal_caches
.
_p_changed
=
1
transaction
.
commit
()
transaction
.
commit
()
...
...
master/product/Vifib/tests/VifibMixin.py
View file @
09c26248
...
@@ -164,10 +164,6 @@ class testVifibMixin(ERP5TypeTestCase):
...
@@ -164,10 +164,6 @@ class testVifibMixin(ERP5TypeTestCase):
def
setupPortalCertificateAuthority
(
self
):
def
setupPortalCertificateAuthority
(
self
):
"""Sets up portal_certificate_authority"""
"""Sets up portal_certificate_authority"""
if
self
.
isLiveTest
():
# nothing to do in case of being called as live test
return
if
not
self
.
portal
.
hasObject
(
'portal_certificate_authority'
):
if
not
self
.
portal
.
hasObject
(
'portal_certificate_authority'
):
self
.
portal
.
manage_addProduct
[
'ERP5'
].
manage_addTool
(
self
.
portal
.
manage_addProduct
[
'ERP5'
].
manage_addTool
(
'ERP5 Certificate Authority Tool'
,
None
)
'ERP5 Certificate Authority Tool'
,
None
)
...
@@ -222,9 +218,6 @@ class testVifibMixin(ERP5TypeTestCase):
...
@@ -222,9 +218,6 @@ class testVifibMixin(ERP5TypeTestCase):
self
.
portal
.
portal_alarms
.
vifib_check_consistency
.
newActiveProcess
()
self
.
portal
.
portal_alarms
.
vifib_check_consistency
.
newActiveProcess
()
finally
:
finally
:
setSecurityManager
(
sm
)
setSecurityManager
(
sm
)
self
.
setupPortalCertificateAuthority
()
self
.
setupPayZenInterface
()
self
.
setUpMemcached
()
import
random
import
random
self
.
portal
.
portal_caches
.
erp5_site_global_id
=
'%s'
%
random
.
random
()
self
.
portal
.
portal_caches
.
erp5_site_global_id
=
'%s'
%
random
.
random
()
self
.
portal
.
portal_caches
.
_p_changed
=
1
self
.
portal
.
portal_caches
.
_p_changed
=
1
...
@@ -305,6 +298,9 @@ class testVifibMixin(ERP5TypeTestCase):
...
@@ -305,6 +298,9 @@ class testVifibMixin(ERP5TypeTestCase):
if
self
.
isLiveTest
():
if
self
.
isLiveTest
():
# nothing to do in Live Test
# nothing to do in Live Test
return
return
self
.
setupPortalCertificateAuthority
()
self
.
setupPayZenInterface
()
self
.
setUpMemcached
()
portal
=
self
.
getPortal
()
portal
=
self
.
getPortal
()
if
'MailHost'
in
portal
.
objectIds
():
if
'MailHost'
in
portal
.
objectIds
():
portal
.
manage_delObjects
([
'MailHost'
])
portal
.
manage_delObjects
([
'MailHost'
])
...
...
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