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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos.core
Commits
09c26248
Commit
09c26248
authored
12 years ago
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Setup things only once.
parent
ff733d03
master
alain
amarisoft
cleanup
cliff-cleanup
column-link-fields
cygwin-link-local
feat/cmmi_cache
feature/cgroups
feature/format-crumbled
feature/manager-cpuset
feature/option_create_tun
feature/tun-cgroup-cleanup
fix-node-boot
fix-portredir-manager
fix/slapos-ansible
format_loop
garbage-collect
hosting_daily_invoice
hotfix/proxy-root-instance
master-dev
monitoring
network-free-instances-count
port-redirection
proxy-sqlalchemy
rafael
registry-hotfix
revert-889711ed
runner
seb
slapgrid_client_test
slaphateoas
slapos-override-env
slapos.cache.source
slaposjs
slapproxy-connection-parameter
support-request-templates
test
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.18
1.3.17
1.3.16
1.3.15
1.3.14
1.3.13
1.3.12
1.3.11
1.3.10
1.3.9
1.3.8
1.3.7
1.3.6.3
1.3.6.2
1.3.6.1
1.3.6
1.3.5
1.3.4
1.3.3
1.3.2
1.3.1
1.3.0
1.2.4.1
1.2.4
1.2.3.1
1.2.3
1.2.2
1.2.1
1.2.0
1.1.3
1.1.2
1.1.1
1.1.0
1.0.5
1.0.4
1.0.3
1.0.2
1.0.1
1.0.0
1.0.0rc6
1.0.0rc5
1.0.0rc4
1.0.0rc3
1.0.0-rc1
0.35.1
0.34
0.33.1
0.33
Changes
2
Show 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
()
...
...
This diff is collapsed.
Click to expand it.
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'
])
...
...
This diff is collapsed.
Click to expand it.
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