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
21
Merge Requests
21
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
65d5d08a
Commit
65d5d08a
authored
5 years ago
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests: Fix conflicts on certificate when run parallel tests
parent
4faf1cfa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
16 deletions
+31
-16
master/product/SlapOS/tests/testSlapOSMixin.py
master/product/SlapOS/tests/testSlapOSMixin.py
+31
-12
master/tests/__init__.py
master/tests/__init__.py
+0
-4
No files found.
master/product/SlapOS/tests/testSlapOSMixin.py
View file @
65d5d08a
...
...
@@ -34,6 +34,7 @@ from Products.ERP5Type.tests.utils import DummyMailHost
from
Products.ERP5Type.Utils
import
convertToUpperCase
import
os
import
glob
import
shutil
from
AccessControl.SecurityManagement
import
getSecurityManager
,
\
setSecurityManager
from
App.config
import
getConfiguration
...
...
@@ -71,28 +72,46 @@ class testSlapOSMixin(ERP5TypeTestCase):
def
createCertificateAuthorityFile
(
self
):
"""Sets up portal_certificate_authority"""
ca_path
=
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
self
.
__class__
.
__name__
)
if
os
.
path
.
exists
(
ca_path
):
shutil
.
rmtree
(
ca_path
)
os
.
mkdir
(
ca_path
)
os
.
mkdir
(
os
.
path
.
join
(
ca_path
,
'private'
))
os
.
mkdir
(
os
.
path
.
join
(
ca_path
,
'crl'
))
os
.
mkdir
(
os
.
path
.
join
(
ca_path
,
'certs'
))
shutil
.
copy
(
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'openssl.cnf'
),
os
.
path
.
join
(
ca_path
,
'openssl.cnf'
))
shutil
.
copy
(
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'cacert.pem'
),
os
.
path
.
join
(
ca_path
,
'cacert.pem'
))
# reset test CA to have it always count from 0
open
(
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'serial'
),
'w'
).
write
(
'01'
)
open
(
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'crlnumber'
),
'w'
).
write
(
'01'
)
open
(
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'index.txt'
),
'w'
).
write
(
''
)
private_list
=
glob
.
glob
(
'%s/*.key'
%
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'private'
))
open
(
os
.
path
.
join
(
ca_path
,
'serial'
),
'w'
).
write
(
'01'
)
open
(
os
.
path
.
join
(
ca_path
,
'crlnumber'
),
'w'
).
write
(
'01'
)
open
(
os
.
path
.
join
(
ca_path
,
'index.txt'
),
'w'
).
write
(
''
)
private_list
=
glob
.
glob
(
'%s/*.key'
%
os
.
path
.
join
(
ca_path
,
'private'
))
for
private
in
private_list
:
os
.
remove
(
private
)
crl_list
=
glob
.
glob
(
'%s/*'
%
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'crl'
))
crl_list
=
glob
.
glob
(
'%s/*'
%
os
.
path
.
join
(
ca_path
,
'crl'
))
for
crl
in
crl_list
:
os
.
remove
(
crl
)
certs_list
=
glob
.
glob
(
'%s/*'
%
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'certs'
))
certs_list
=
glob
.
glob
(
'%s/*'
%
os
.
path
.
join
(
ca_path
,
'certs'
))
for
cert
in
certs_list
:
os
.
remove
(
cert
)
newcerts_list
=
glob
.
glob
(
'%s/*'
%
os
.
path
.
join
(
os
.
environ
[
'TEST_CA_PATH'
],
'newcerts'
))
newcerts_list
=
glob
.
glob
(
'%s/*'
%
os
.
path
.
join
(
ca_path
,
'newcerts'
))
for
newcert
in
newcerts_list
:
os
.
remove
(
newcert
)
self
.
portal
.
portal_certificate_authority
.
manage_editCertificateAuthorityTool
(
certificate_authority_path
=
ca_path
)
def
setupPortalAlarms
(
self
):
if
not
self
.
portal
.
portal_alarms
.
isSubscribed
():
...
...
This diff is collapsed.
Click to expand it.
master/tests/__init__.py
View file @
65d5d08a
...
...
@@ -58,7 +58,3 @@ class SlapOSCloud(SavedTestSuite, ProjectTestSuite):
test_list
.
append
(
test_case
)
return
test_list
def
__init__
(
self
,
max_instance_count
=
1
,
*
args
,
**
kw
):
# hardcode number of node, to prevent concurrency issue on certificate
# authority file system storage
super
(
SlapOSCloud
,
self
).
__init__
(
max_instance_count
=
1
,
*
args
,
**
kw
)
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