Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2761 from bblommers/bugfix/1427

Browse Source 
EMR - Return start time of first step
This commit is contained in:
Steve Pulec 2020-02-22 18:26:01 -06:00 committed by GitHub
commit a89c150627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/emr/models.py
View File

@ -86,6 +86,9 @@ class FakeStep(BaseModel):
self.start_datetime = None self.start_datetime = None
self.state = state self.state = state
def start(self):
self.start_datetime = datetime.now(pytz.utc)
class FakeCluster(BaseModel): class FakeCluster(BaseModel):
def __init__( def __init__(
@ -204,6 +207,8 @@ class FakeCluster(BaseModel):
self.start_cluster() self.start_cluster()
self.run_bootstrap_actions() self.run_bootstrap_actions()
if self.steps:
self.steps[0].start()
@property @property
def instance_groups(self): def instance_groups(self):

2
moto/emr/responses.py
View File

@ -835,7 +835,7 @@ LIST_STEPS_TEMPLATE = """<ListStepsResponse xmlns="http://elasticmapreduce.amazo
{% if step.end_datetime is not none %} {% if step.end_datetime is not none %}
<EndDateTime>{{ step.end_datetime.isoformat() }}</EndDateTime> <EndDateTime>{{ step.end_datetime.isoformat() }}</EndDateTime>
{% endif %} {% endif %}
{% if step.ready_datetime is not none %} {% if step.start_datetime is not none %}
<StartDateTime>{{ step.start_datetime.isoformat() }}</StartDateTime> <StartDateTime>{{ step.start_datetime.isoformat() }}</StartDateTime>
{% endif %} {% endif %}
</Timeline> </Timeline>

4
tests/test_emr/test_emr_boto3.py
View File

@ -752,7 +752,9 @@ def test_steps():
# StateChangeReason # StateChangeReason
x["Status"]["Timeline"]["CreationDateTime"].should.be.a("datetime.datetime") x["Status"]["Timeline"]["CreationDateTime"].should.be.a("datetime.datetime")
# x['Status']['Timeline']['EndDateTime'].should.be.a('datetime.datetime') # x['Status']['Timeline']['EndDateTime'].should.be.a('datetime.datetime')
# x['Status']['Timeline']['StartDateTime'].should.be.a('datetime.datetime') # Only the first step will have started - we don't know anything about when it finishes, so the second step never starts
if x["Name"] == "My wordcount example":
x["Status"]["Timeline"]["StartDateTime"].should.be.a("datetime.datetime")
x = client.describe_step(ClusterId=cluster_id, StepId=x["Id"])["Step"] x = client.describe_step(ClusterId=cluster_id, StepId=x["Id"])["Step"]
x["ActionOnFailure"].should.equal("TERMINATE_CLUSTER") x["ActionOnFailure"].should.equal("TERMINATE_CLUSTER")