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
Ophélie Gagnard
slapos.core
Commits
4fdc257d
Commit
4fdc257d
authored
Sep 04, 2019
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud/SlapOSTestCaseMixin: No need to edit twice the allocation_scope
parent
651e64ab
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
...teItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
+2
-4
No files found.
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
View file @
4fdc257d
...
@@ -189,12 +189,12 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -189,12 +189,12 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
self
.
requested_software_instance
.
validate
()
self
.
requested_software_instance
.
validate
()
self
.
tic
()
self
.
tic
()
def
_makeComputer
(
self
,
owner
=
None
,
allocation_scope
=
None
):
def
_makeComputer
(
self
,
owner
=
None
,
allocation_scope
=
'open/public'
):
self
.
computer
=
self
.
portal
.
computer_module
.
template_computer
\
self
.
computer
=
self
.
portal
.
computer_module
.
template_computer
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
Base_createCloneDocument
(
batch_mode
=
1
)
reference
=
'TESTCOMP-%s'
%
self
.
generateNewId
()
reference
=
'TESTCOMP-%s'
%
self
.
generateNewId
()
self
.
computer
.
edit
(
self
.
computer
.
edit
(
allocation_scope
=
'open/public'
,
allocation_scope
=
allocation_scope
,
reference
=
reference
,
reference
=
reference
,
title
=
reference
title
=
reference
)
)
...
@@ -216,8 +216,6 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -216,8 +216,6 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
self
.
computer
.
edit
(
self
.
computer
.
edit
(
source_administration_value
=
owner
,
source_administration_value
=
owner
,
)
)
if
allocation_scope
is
not
None
:
self
.
computer
.
edit
(
allocation_scope
=
allocation_scope
)
return
self
.
computer
,
self
.
partition
return
self
.
computer
,
self
.
partition
...
...
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