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
Xiaowu Zhang
slapos.core
Commits
0812d6da
Commit
0812d6da
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
slapproxy test: use current running code to start external proxy.
parent
368d0da0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
slapos/tests/slapproxy/__init__.py
slapos/tests/slapproxy/__init__.py
+7
-2
No files found.
slapos/tests/slapproxy/__init__.py
View file @
0812d6da
...
@@ -34,6 +34,7 @@ import logging
...
@@ -34,6 +34,7 @@ import logging
import
shutil
import
shutil
import
socket
import
socket
import
subprocess
import
subprocess
import
sys
import
tempfile
import
tempfile
import
time
import
time
import
unittest
import
unittest
...
@@ -903,8 +904,12 @@ database_uri = %(tempdir)s/lib/external_proxy.db
...
@@ -903,8 +904,12 @@ database_uri = %(tempdir)s/lib/external_proxy.db
Start external slapproxy
Start external slapproxy
"""
"""
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 use current dev version, not standard one installed through package
# XXX This uses a hack to run current code of slapos.core
self
.
external_proxy_process
=
subprocess
.
Popen
([
'slapos'
,
'proxy'
,
'start'
,
'--cfg'
,
self
.
external_slapproxy_configuration_file_location
])
import
slapos
self
.
external_proxy_process
=
subprocess
.
Popen
([
sys
.
executable
,
'%s/cli/entry.py'
%
os
.
path
.
dirname
(
slapos
.
__file__
),
'proxy'
,
'start'
,
'--cfg'
,
self
.
external_slapproxy_configuration_file_location
])
# 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