From bed769a387e667f7d6cb4dbf306963f70f54afbd Mon Sep 17 00:00:00 2001 From: Bert Blommers Date: Fri, 17 Jul 2020 12:11:47 +0100 Subject: [PATCH] Tech debt - increase test timeouts to remove intermittant test failures (#3146) --- moto/batch/models.py | 4 ++-- tests/test_batch/test_batch.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/moto/batch/models.py b/moto/batch/models.py index 95ad6478..fde74491 100644 --- a/moto/batch/models.py +++ b/moto/batch/models.py @@ -443,8 +443,8 @@ class Job(threading.Thread, BaseModel): now = datetime.datetime.now() i = 1 while container.status == "running" and not self.stop: - time.sleep(0.15) - if i % 10 == 0: + time.sleep(0.2) + if i % 5 == 0: logs_stderr.extend( container.logs( stdout=False, diff --git a/tests/test_batch/test_batch.py b/tests/test_batch/test_batch.py index 4b75fb85..566be6ac 100644 --- a/tests/test_batch/test_batch.py +++ b/tests/test_batch/test_batch.py @@ -6,6 +6,7 @@ import boto3 from botocore.exceptions import ClientError import sure # noqa from moto import mock_batch, mock_iam, mock_ec2, mock_ecs, mock_logs + import functools import nose @@ -729,13 +730,13 @@ def test_submit_job(): future = datetime.datetime.now() + datetime.timedelta(seconds=30) while datetime.datetime.now() < future: + time.sleep(1) resp = batch_client.describe_jobs(jobs=[job_id]) if resp["jobs"][0]["status"] == "FAILED": raise RuntimeError("Batch job failed") if resp["jobs"][0]["status"] == "SUCCEEDED": break - time.sleep(0.5) else: raise RuntimeError("Batch job timed out") @@ -872,7 +873,7 @@ def test_terminate_job(): batch_client.terminate_job(jobId=job_id, reason="test_terminate") - time.sleep(1) + time.sleep(2) resp = batch_client.describe_jobs(jobs=[job_id]) resp["jobs"][0]["jobName"].should.equal("test1")