saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prefer subprocess.Popen, we're not streaming anything.

Browse source
This commit is contained in:
Pedro Algarvio 2014-04-07 23:25:01 +01:00
parent 737a21c34c
commit 148c8063e4
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/jenkins.py
View file

@ -392,14 +392,12 @@ def run(opts):
if opts.salt_url is not None:
# Let's find out if the cloned repository if checked out from the
# desired repository
proc = NonBlockingPopen(
proc = subprocess.Popen(
'salt -t 100 {vm_name} --out json git.remote_get /testing'.format(vm_name=vm_name),
shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stream_stds=False
)
proc.poll_and_read_until_finish()
stdout, _ = proc.communicate()
sys.stdout.flush()
@ -430,14 +428,12 @@ def run(opts):
if opts.commit is not None:
# Let's find out if the cloned repository if checked out at the desired
# commit
proc = NonBlockingPopen(
proc = subprocess.Popen(
'salt -t 100 {vm_name} --out json git.revision /testing'.format(vm_name=vm_name),
shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stream_stds=False
)
proc.poll_and_read_until_finish()
stdout, _ = proc.communicate()
sys.stdout.flush()