Commit ad18eca4 authored by Jérome Perrin's avatar Jérome Perrin

tests/slapproxy: discard child slapos proxy output

to keep tests silent.

On python2, this uses subprocess32, which backports DEVNULL (and
default setting of closing file descriptors).
parent 3977c095
...@@ -34,7 +34,10 @@ import os ...@@ -34,7 +34,10 @@ import os
import logging import logging
import shutil import shutil
import socket import socket
import subprocess try:
import subprocess32 as subprocess
except ImportError:
import subprocess
import sys import sys
import tempfile import tempfile
import time import time
...@@ -1029,6 +1032,8 @@ database_uri = %(tempdir)s/lib/external_proxy.db ...@@ -1029,6 +1032,8 @@ database_uri = %(tempdir)s/lib/external_proxy.db
sys.executable, '%s/../cli/entry.py' % os.path.dirname(slapos.tests.__file__), sys.executable, '%s/../cli/entry.py' % os.path.dirname(slapos.tests.__file__),
'proxy', 'start', '--cfg', self.external_slapproxy_configuration_file_location 'proxy', 'start', '--cfg', self.external_slapproxy_configuration_file_location
], ],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
env={"PYTHONPATH": ':'.join(sys.path)} env={"PYTHONPATH": ':'.join(sys.path)}
) )
# Wait a bit for proxy to be started # Wait a bit for proxy to be started
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment