From bb5a54ca4b42a77f98c276009552087a3926a031 Mon Sep 17 00:00:00 2001
From: Bert Blommers <info@bertblommers.nl>
Date: Thu, 12 Mar 2020 13:37:46 +0000
Subject: [PATCH] Batch - Fix tests

---
 moto/batch/models.py           |  6 ++++--
 tests/test_batch/test_batch.py | 37 ++++++++--------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/moto/batch/models.py b/moto/batch/models.py
index a5986b7a..08f4cbdb 100644
--- a/moto/batch/models.py
+++ b/moto/batch/models.py
@@ -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
diff --git a/tests/test_batch/test_batch.py b/tests/test_batch/test_batch.py
index de4b349e..6eedf452 100644
--- a/tests/test_batch/test_batch.py
+++ b/tests/test_batch/test_batch.py
@@ -10,17 +10,6 @@ import functools
 import nose
 
 
-def expected_failure(test):
-    @functools.wraps(test)
-    def inner(*args, **kwargs):
-        try:
-            test(*args, **kwargs)
-        except Exception as err:
-            raise nose.SkipTest
-
-    return inner
-
-
 DEFAULT_REGION = "eu-central-1"
 
 
@@ -693,7 +682,6 @@ def test_submit_job_by_name():
 
 # SLOW TESTS
 
-# @expected_failure
 @mock_logs
 @mock_ec2
 @mock_ecs
@@ -721,13 +709,13 @@ def test_submit_job():
     queue_arn = resp["jobQueueArn"]
 
     resp = batch_client.register_job_definition(
-        jobDefinitionName="sleep10",
+        jobDefinitionName="sayhellotomylittlefriend",
         type="container",
         containerProperties={
-            "image": "busybox",
+            "image": "busybox:latest",
             "vcpus": 1,
             "memory": 128,
-            "command": ["sleep", "10"],
+            "command": ["echo", "hello"],
         },
     )
     job_def_arn = resp["jobDefinitionArn"]
@@ -741,13 +729,6 @@ def test_submit_job():
 
     while datetime.datetime.now() < future:
         resp = batch_client.describe_jobs(jobs=[job_id])
-        print(
-            "{0}:{1} {2}".format(
-                resp["jobs"][0]["jobName"],
-                resp["jobs"][0]["jobId"],
-                resp["jobs"][0]["status"],
-            )
-        )
 
         if resp["jobs"][0]["status"] == "FAILED":
             raise RuntimeError("Batch job failed")
@@ -764,10 +745,9 @@ def test_submit_job():
     resp = logs_client.get_log_events(
         logGroupName="/aws/batch/job", logStreamName=ls_name
     )
-    len(resp["events"]).should.be.greater_than(5)
+    [event['message'] for event in resp["events"]].should.equal(['hello'])
 
 
-@expected_failure
 @mock_logs
 @mock_ec2
 @mock_ecs
@@ -795,13 +775,13 @@ def test_list_jobs():
     queue_arn = resp["jobQueueArn"]
 
     resp = batch_client.register_job_definition(
-        jobDefinitionName="sleep10",
+        jobDefinitionName="sleep5",
         type="container",
         containerProperties={
-            "image": "busybox",
+            "image": "busybox:latest",
             "vcpus": 1,
             "memory": 128,
-            "command": ["sleep", "10"],
+            "command": ["sleep", "5"],
         },
     )
     job_def_arn = resp["jobDefinitionArn"]
@@ -844,7 +824,6 @@ def test_list_jobs():
     len(resp_finished_jobs2["jobSummaryList"]).should.equal(2)
 
 
-@expected_failure
 @mock_logs
 @mock_ec2
 @mock_ecs
@@ -875,7 +854,7 @@ def test_terminate_job():
         jobDefinitionName="sleep10",
         type="container",
         containerProperties={
-            "image": "busybox",
+            "image": "busybox:latest",
             "vcpus": 1,
             "memory": 128,
             "command": ["sleep", "10"],