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
Xavier Thompson
slapos.core
Commits
44ee026b
Commit
44ee026b
authored
Oct 04, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testSlapOSMixin: No need to declare getUserFolder
parent
cfae019e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
9 deletions
+2
-9
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudSecurityGroup.py
...rtal_components/test.erp5.testSlapOSCloudSecurityGroup.py
+2
-2
master/product/SlapOS/tests/testSlapOSMixin.py
master/product/SlapOS/tests/testSlapOSMixin.py
+0
-7
No files found.
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudSecurityGroup.py
View file @
44ee026b
...
@@ -55,7 +55,7 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin):
...
@@ -55,7 +55,7 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin):
"""Checks that a user with login and password exists and can log in to the
"""Checks that a user with login and password exists and can log in to the
system.
system.
"""
"""
uf
=
self
.
getUserFolder
()
uf
=
self
.
portal
.
acl_users
self
.
assertNotEqual
(
uf
.
getUserById
(
user_id
,
None
),
None
)
self
.
assertNotEqual
(
uf
.
getUserById
(
user_id
,
None
),
None
)
for
_
,
plugin
in
uf
.
_getOb
(
'plugins'
).
listPlugins
(
for
_
,
plugin
in
uf
.
_getOb
(
'plugins'
).
listPlugins
(
IAuthenticationPlugin
):
IAuthenticationPlugin
):
...
@@ -72,7 +72,7 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin):
...
@@ -72,7 +72,7 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin):
"""Checks that a user with login and password does not exists and cannot
"""Checks that a user with login and password does not exists and cannot
log in to the system.
log in to the system.
"""
"""
uf
=
self
.
getUserFolder
()
uf
=
self
.
portal
.
acl_users
for
plugin_name
,
plugin
in
uf
.
_getOb
(
'plugins'
).
listPlugins
(
for
plugin_name
,
plugin
in
uf
.
_getOb
(
'plugins'
).
listPlugins
(
IAuthenticationPlugin
):
IAuthenticationPlugin
):
if
plugin
.
authenticateCredentials
(
if
plugin
.
authenticateCredentials
(
...
...
master/product/SlapOS/tests/testSlapOSMixin.py
View file @
44ee026b
...
@@ -147,12 +147,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
...
@@ -147,12 +147,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
if
self
.
abort_transaction
:
if
self
.
abort_transaction
:
transaction
.
abort
()
transaction
.
abort
()
def
getUserFolder
(
self
):
"""
Return the user folder
"""
return
getattr
(
self
.
getPortal
(),
'acl_users'
,
None
)
def
setUpOnce
(
self
):
def
setUpOnce
(
self
):
self
.
commit
()
self
.
commit
()
self
.
portal
.
portal_templates
.
updateRepositoryBusinessTemplateList
(
self
.
portal
.
portal_templates
.
updateRepositoryBusinessTemplateList
(
...
@@ -162,7 +156,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
...
@@ -162,7 +156,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
def
updateInitSite
(
self
):
def
updateInitSite
(
self
):
self
.
portal
.
portal_caches
.
updateCache
()
self
.
portal
.
portal_caches
.
updateCache
()
try
:
try
:
initsite
=
config
.
product_config
[
"initsite"
]
initsite
=
config
.
product_config
[
"initsite"
]
except
KeyError
:
except
KeyError
:
...
...
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