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
58fa7d34
Commit
58fa7d34
authored
Sep 15, 2014
by
Cédric de Saint Martin
Committed by
Rafael Monnerat
Nov 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! slapproxy test: use current running code to start external proxy.
parent
a751aeb4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
slapos/tests/slapproxy/__init__.py
slapos/tests/slapproxy/__init__.py
+7
-4
No files found.
slapos/tests/slapproxy/__init__.py
View file @
58fa7d34
...
@@ -906,10 +906,13 @@ database_uri = %(tempdir)s/lib/external_proxy.db
...
@@ -906,10 +906,13 @@ database_uri = %(tempdir)s/lib/external_proxy.db
logging
.
getLogger
().
info
(
'Starting external proxy, listening to %s:%s'
%
(
self
.
external_proxy_host
,
self
.
external_proxy_port
))
logging
.
getLogger
().
info
(
'Starting external proxy, listening to %s:%s'
%
(
self
.
external_proxy_host
,
self
.
external_proxy_port
))
# XXX This uses a hack to run current code of slapos.core
# XXX This uses a hack to run current code of slapos.core
import
slapos
import
slapos
self
.
external_proxy_process
=
subprocess
.
Popen
([
self
.
external_proxy_process
=
subprocess
.
Popen
(
[
sys
.
executable
,
'%s/cli/entry.py'
%
os
.
path
.
dirname
(
slapos
.
__file__
),
sys
.
executable
,
'%s/cli/entry.py'
%
os
.
path
.
dirname
(
slapos
.
__file__
),
'proxy'
,
'start'
,
'--cfg'
,
self
.
external_slapproxy_configuration_file_location
'proxy'
,
'start'
,
'--cfg'
,
self
.
external_slapproxy_configuration_file_location
])
],
env
=
{
"PYTHONPATH"
:
':'
.
join
(
sys
.
path
)}
)
# Wait a bit for proxy to be started
# Wait a bit for proxy to be started
attempts
=
0
attempts
=
0
while
(
attempts
<
20
):
while
(
attempts
<
20
):
...
...
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