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
16
Merge Requests
16
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
2dc6edd7
Commit
2dc6edd7
authored
Mar 07, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid divergency in tests.
Edit only hosting delivery, as this one does not come from simulation.
parent
148c0b87
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
20 deletions
+4
-20
master/product/Vifib/tests/testVifibSlapWebService.py
master/product/Vifib/tests/testVifibSlapWebService.py
+4
-20
No files found.
master/product/Vifib/tests/testVifibSlapWebService.py
View file @
2dc6edd7
...
...
@@ -3454,16 +3454,12 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
computer_partition_uid
=
sequence
[
"computer_partition_uid"
]
computer_partition
=
self
.
portal
.
portal_catalog
.
getResultValue
(
uid
=
computer_partition_uid
)
hosting_date
=
DateTime
()
setup_date
=
hosting_date
+
1
hosting_date
=
DateTime
()
-
1
for
movement
in
computer_partition
.
getAggregateRelatedValueList
(
portal_type
=
self
.
sale_packing_list_line_portal_type
):
if
movement
.
getResource
()
==
\
movement
.
portal_preferences
.
getPreferredInstanceHostingResource
():
movement
.
edit
(
start_date
=
hosting_date
)
elif
movement
.
getResource
()
==
\
movement
.
portal_preferences
.
getPreferredInstanceSetupResource
():
movement
.
edit
(
start_date
=
setup_date
)
def
stepCheckPackingListAmountTwoComputerPartition
(
self
,
sequence
,
**
kw
):
computer_partition_uid
=
sequence
[
"computer_partition_uid"
]
...
...
@@ -3479,16 +3475,12 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
computer_partition_uid
=
sequence
[
"computer_partition_uid"
]
computer_partition
=
self
.
portal
.
portal_catalog
.
getResultValue
(
uid
=
computer_partition_uid
)
setup_date
=
DateTime
()
hosting_date
=
setup_date
+
1
hosting_date
=
DateTime
()
+
1
for
movement
in
computer_partition
.
getAggregateRelatedValueList
(
portal_type
=
self
.
sale_packing_list_line_portal_type
):
if
movement
.
getResource
()
==
\
movement
.
portal_preferences
.
getPreferredInstanceHostingResource
():
movement
.
edit
(
start_date
=
hosting_date
)
elif
movement
.
getResource
()
==
\
movement
.
portal_preferences
.
getPreferredInstanceSetupResource
():
movement
.
edit
(
start_date
=
setup_date
)
def
stepSetPurchasePackingListLineSetupResource
(
self
,
sequence
,
**
kw
):
"""
...
...
@@ -3508,16 +3500,12 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
computer_partition_uid
=
sequence
[
"computer_uid"
]
computer_partition
=
self
.
portal
.
portal_catalog
.
getResultValue
(
uid
=
computer_partition_uid
)
hosting_date
=
DateTime
()
setup_date
=
hosting_date
+
1
hosting_date
=
DateTime
()
-
1
service_uid
=
sequence
[
'service_uid'
]
for
movement
in
computer_partition
.
getAggregateRelatedValueList
(
portal_type
=
self
.
purchase_packing_list_line_portal_type
):
if
movement
.
getResourceUid
()
==
service_uid
:
movement
.
edit
(
start_date
=
hosting_date
)
elif
movement
.
getResource
()
==
\
movement
.
portal_preferences
.
getPreferredSoftwareSetupResource
():
movement
.
edit
(
start_date
=
setup_date
)
def
stepSetAccountingAfterSetupStartDate
(
self
,
sequence
,
**
kw
):
"""
...
...
@@ -3526,16 +3514,12 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
computer_partition_uid
=
sequence
[
"computer_uid"
]
computer_partition
=
self
.
portal
.
portal_catalog
.
getResultValue
(
uid
=
computer_partition_uid
)
setup_date
=
DateTime
()
hosting_date
=
setup_date
+
1
hosting_date
=
DateTime
()
+
1
service_uid
=
sequence
[
'service_uid'
]
for
movement
in
computer_partition
.
getAggregateRelatedValueList
(
portal_type
=
self
.
sale_packing_list_line_portal_type
):
if
movement
.
getResourceUid
()
==
service_uid
:
movement
.
edit
(
start_date
=
hosting_date
)
elif
movement
.
getResource
()
==
\
movement
.
portal_preferences
.
getPreferredSoftwareSetupResource
():
movement
.
edit
(
start_date
=
setup_date
)
def
_checkComputerPartitionAndRelatedSoftwareInstance
(
self
,
computer_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