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
18
Merge Requests
18
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
69686a8c
Commit
69686a8c
authored
Mar 10, 2024
by
Jérome Perrin
Committed by
Rafael Monnerat
Mar 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SlapOSCacheMixin: store cache json sorted for easier testing
slapos_cloud:testSlapOSCloud fails with PYTHONHASHSEED=385
parent
251dd72f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSCacheMixin.py
...lateItem/portal_components/mixin.erp5.SlapOSCacheMixin.py
+1
-1
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloud.py
...mplateItem/portal_components/test.erp5.testSlapOSCloud.py
+12
-4
No files found.
master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSCacheMixin.py
View file @
69686a8c
...
@@ -138,7 +138,7 @@ class SlapOSCacheMixin:
...
@@ -138,7 +138,7 @@ class SlapOSCacheMixin:
'state'
:
state
,
'state'
:
state
,
'reference'
:
self
.
getReference
(),
'reference'
:
self
.
getReference
(),
'portal_type'
:
self
.
getPortalType
()
'portal_type'
:
self
.
getPortalType
()
})
}
,
sort_keys
=
True
)
cache_duration
=
self
.
_getAccessStatusCacheFactory
().
cache_duration
cache_duration
=
self
.
_getAccessStatusCacheFactory
().
cache_duration
self
.
_getAccessStatusPlugin
().
set
(
self
.
_getAccessStatusCacheKey
(),
self
.
_getAccessStatusPlugin
().
set
(
self
.
_getAccessStatusCacheKey
(),
...
...
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloud.py
View file @
69686a8c
...
@@ -115,7 +115,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
...
@@ -115,7 +115,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
'since'
:
'%s'
%
since
,
'since'
:
'%s'
%
since
,
'state'
:
""
,
'state'
:
""
,
"text"
:
"#access TEST123 %s"
%
doc
.
getUid
()
"text"
:
"#access TEST123 %s"
%
doc
.
getUid
()
})
},
sort_keys
=
True
,
)
def
getBaseExpectedDict
(
doc
):
def
getBaseExpectedDict
(
doc
):
return
_decode_with_json
({
return
_decode_with_json
({
"portal_type"
:
doc
.
getPortalType
(),
"portal_type"
:
doc
.
getPortalType
(),
...
@@ -187,7 +189,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
...
@@ -187,7 +189,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
'since'
:
'%s'
%
since
,
'since'
:
'%s'
%
since
,
'state'
:
""
,
'state'
:
""
,
"text"
:
"#access TEST123 %s"
%
doc
.
getUid
()
"text"
:
"#access TEST123 %s"
%
doc
.
getUid
()
})
},
sort_keys
=
True
,
)
def
getBaseExpectedDict
(
doc
):
def
getBaseExpectedDict
(
doc
):
return
_decode_with_json
({
return
_decode_with_json
({
"portal_type"
:
doc
.
getPortalType
(),
"portal_type"
:
doc
.
getPortalType
(),
...
@@ -267,7 +271,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
...
@@ -267,7 +271,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
'since'
:
'%s'
%
since
,
'since'
:
'%s'
%
since
,
'state'
:
""
,
'state'
:
""
,
"text"
:
"#error TEST123 %s"
%
doc
.
getUid
()
"text"
:
"#error TEST123 %s"
%
doc
.
getUid
()
})
},
sort_keys
=
True
,
)
def
getBaseExpectedDict
(
doc
):
def
getBaseExpectedDict
(
doc
):
return
_decode_with_json
({
return
_decode_with_json
({
"portal_type"
:
doc
.
getPortalType
(),
"portal_type"
:
doc
.
getPortalType
(),
...
@@ -338,7 +344,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
...
@@ -338,7 +344,9 @@ class TestSlapOSCloudSlapOSCacheMixin(
'since'
:
'%s'
%
since
,
'since'
:
'%s'
%
since
,
'state'
:
""
,
'state'
:
""
,
"text"
:
"#building TEST123 %s"
%
doc
.
getUid
()
"text"
:
"#building TEST123 %s"
%
doc
.
getUid
()
})
},
sort_keys
=
True
,
)
def
getBaseExpectedDict
(
doc
):
def
getBaseExpectedDict
(
doc
):
return
_decode_with_json
({
return
_decode_with_json
({
"portal_type"
:
doc
.
getPortalType
(),
"portal_type"
:
doc
.
getPortalType
(),
...
...
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