Merge 9356812 into 3e41d09

bin/Dockerfile.base

@@ -57,7 +57,7 @@ RUN mkdir -p /opt/code/localstack/localstack/infra && \
     wget -O /tmp/localstack.es.zip \
         https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.0.zip && \
     wget -O /tmp/elasticmq-server.jar \
-        https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.14.2.jar && \
+        https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.14.5.jar && \
     (cd localstack/infra/ && unzip -q /tmp/localstack.es.zip && \
         mv elasticsearch* elasticsearch && rm /tmp/localstack.es.zip) && \
     mkdir -p /opt/code/localstack/localstack/infra/dynamodb && \

tests/integration/test_elasticsearch.py

@@ -1,6 +1,7 @@
 import json
 import time
 from botocore.exceptions import ClientError
+import traceback
 from nose.tools import assert_raises, assert_equal, assert_true, assert_false
 from localstack.utils.aws import aws_stack
 from localstack.utils.common import safe_requests as requests
@@ -73,8 +74,12 @@ def test_domain_creation():
     assert_true(status['DomainStatus']['EBSOptions']['EBSEnabled'])
 
     # make sure we can fake adding tags to a domain
-    response = es_client.add_tags(ARN='string', TagList=[{'Key': 'SOME_TAG', 'Value': 'SOME_VALUE'}])
-    assert_equal(200, response['ResponseMetadata']['HTTPStatusCode'])
+    try:
+        response = es_client.add_tags(ARN='string', TagList=[{'Key': 'SOME_TAG', 'Value': 'SOME_VALUE'}])
+        assert_equal(200, response['ResponseMetadata']['HTTPStatusCode'])
+    except ClientError as e:
+        print(str(e))
+        print(traceback.format_exc())
 
     # make sure domain deletion works
     es_client.delete_elasticsearch_domain(DomainName=TEST_DOMAIN_NAME)