Get standalone server mode working for all tests.

This commit is contained in:
Steve Pulec 2017-02-23 19:43:48 -05:00
commit 81836b6981
78 changed files with 957 additions and 783 deletions

7
moto/emr/exceptions.py Normal file
View file

@ -0,0 +1,7 @@
from __future__ import unicode_literals
from moto.core.exceptions import RESTError
class EmrError(RESTError):
code = 400

View file

@ -299,6 +299,7 @@ class ElasticMapReduceBackend(BaseBackend):
created_before = dtparse(created_before)
clusters = [c for c in clusters if c.creation_datetime < created_before]
# Amazon EMR can return a maximum of 512 job flow descriptions
return sorted(clusters, key=lambda x: x.id)[:512]
def describe_step(self, cluster_id, step_id):

View file

@ -5,15 +5,14 @@ from datetime import datetime
from functools import wraps
import pytz
from botocore.exceptions import ClientError
from moto.compat import urlparse
from moto.core.responses import AWSServiceSpec
from moto.core.responses import BaseResponse
from moto.core.responses import xml_to_json_response
from .exceptions import EmrError
from .models import emr_backends
from .utils import steps_from_query_string
from .utils import tags_from_query_string
from .utils import steps_from_query_string, tags_from_query_string
def generate_boto3_response(operation):
@ -46,7 +45,7 @@ class ElasticMapReduceResponse(BaseResponse):
aws_service_spec = AWSServiceSpec('data/emr/2009-03-31/service-2.json')
def get_region_from_url(self, full_url):
def get_region_from_url(self, request, full_url):
parsed = urlparse(full_url)
for regex in self.region_regex:
match = regex.search(parsed.netloc)
@ -240,9 +239,7 @@ class ElasticMapReduceResponse(BaseResponse):
'Only one AMI version and release label may be specified. '
'Provided AMI: {0}, release label: {1}.').format(
ami_version, release_label)
raise ClientError(
{'Error': {'Code': 'ValidationException',
'Message': message}}, 'RunJobFlow')
raise EmrError(error_type="ValidationException", message=message, template='single_error')
else:
if ami_version:
kwargs['requested_ami_version'] = ami_version