catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Batch - Fix tests

Browse source
This commit is contained in:
Bert Blommers 2020-03-12 13:37:46 +00:00
commit bb5a54ca4b
2 changed files with 12 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
moto/batch/models.py
View file

@ -301,7 +301,7 @@ class Job(threading.Thread, BaseModel):
self.job_name = name
self.job_id = str(uuid.uuid4())
self.job_definition = job_def
self.container_overrides = container_overrides
self.container_overrides = container_overrides or {}
self.job_queue = job_queue
self.job_state = "SUBMITTED" # One of SUBMITTED | PENDING | RUNNABLE | STARTING | RUNNING | SUCCEEDED | FAILED
self.job_queue.jobs.append(self)
@ -317,6 +317,7 @@ class Job(threading.Thread, BaseModel):
self.docker_client = docker.from_env()
self._log_backend = log_backend
self.log_stream_name = None
# Unfortunately mocking replaces this method w/o fallback enabled, so we
# need to replace it if we detect it's been mocked
@ -504,7 +505,8 @@ class Job(threading.Thread, BaseModel):
for line in logs_stdout + logs_stderr:
date, line = line.split(" ", 1)
date = dateutil.parser.parse(date)
date = int(date.timestamp())
# TODO: Replace with int(date.timestamp()) once we yeet Python2 out of the window
date = int((time.mktime(date.timetuple()) + date.microsecond / 1000000.0))
logs.append({"timestamp": date, "message": line.strip()})
# Send to cloudwatch