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

Provide nbopen poller default and increase interval in jenkins

Browse source
This commit is contained in:
Mike Place 2014-11-19 10:56:44 -07:00
parent 5700f7da6a
commit 6b0e9c4e29
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/nb_popen.py
View file

@ -205,7 +205,7 @@ class NonBlockingPopen(subprocess.Popen):
if not conn.closed:
fcntl.fcntl(conn, fcntl.F_SETFL, flags)
def poll_and_read_until_finish(self):
def poll_and_read_until_finish(self, interval=0.01):
silent_iterations = 0
while self.poll() is None:
if self.stdout is not None:
@ -225,7 +225,7 @@ class NonBlockingPopen(subprocess.Popen):
log.debug(stdoutdata)
if stderrdata:
log.error(stderrdata)
time.sleep(0.01)
time.sleep(interval)
def communicate(self, input=None):
super(NonBlockingPopen, self).communicate(input)

18
tests/jenkins-ng.py
View file

@ -244,7 +244,7 @@ def sync_minion(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
@ -320,7 +320,7 @@ def delete_vm(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
@ -371,7 +371,7 @@ def download_unittest_reports(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -425,7 +425,7 @@ def download_coverage_report(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -504,7 +504,7 @@ def download_remote_logs(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -572,7 +572,7 @@ def prepare_ssh_access(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -894,7 +894,7 @@ def main():
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
retcode = proc.returncode
@ -1017,7 +1017,7 @@ def main():
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print('Failed to execute the preparation SLS file. Exit code: {0}'.format(proc.returncode))
@ -1060,7 +1060,7 @@ def main():
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print('Failed to execute the 2nd preparation SLS file. Exit code: {0}'.format(proc.returncode))

12
tests/jenkins.py
View file

@ -113,7 +113,7 @@ def delete_vm(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
@ -207,7 +207,7 @@ def download_unittest_reports(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -247,7 +247,7 @@ def download_coverage_report(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -303,7 +303,7 @@ def download_remote_logs(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -349,7 +349,7 @@ def download_packages(options):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
if proc.returncode != 0:
print(
@ -411,7 +411,7 @@ def run(opts):
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.poll_and_read_until_finish(interval=0.5)
proc.communicate()
retcode = proc.returncode