From c4ce9af767bcbeaec3ce1a3522703173309f442b Mon Sep 17 00:00:00 2001
From: Nick Lang <nick@nicklang.com>
Date: Wed, 10 Jan 2018 13:40:17 -0700
Subject: [PATCH 1/2] Skipping/Unskipping tests

Some tests need to be skipped till changes occur in elastic/elasticsarch
Also some previously skipped tests can be unskipped now.
---
 test_elasticsearch/test_server/test_common.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test_elasticsearch/test_server/test_common.py b/test_elasticsearch/test_server/test_common.py
index dbb94d41..6261527f 100644
--- a/test_elasticsearch/test_server/test_common.py
+++ b/test_elasticsearch/test_server/test_common.py
@@ -41,9 +41,9 @@ SKIP_TESTS = {
               'TestClusterPutSettings10Basic', 'TestIndex10WithId',
               'TestClusterPutScript10Basic', 'TestIndicesPutMapping10Basic',
               'TestIndicesPutTemplate10Basic', 'TestMsearch10Basic',
-              # skip these two till https://github.com/elastic/elasticsearch/pull/26905 has been merged
-              'TestSearchAggregation190PercentilesHdrMetric',
-              'TestSearchAggregation180PercentilesTdigestMetric',
+              # Skipping some broken integration tests:
+              'TestIndicesOpen10Basic', 'TestClusterRemoteInfo10Info',
+              'TestIndicesSplit10Basic', 'TestIndicesSplit20SourceMapping'
               ))
 
 }

From 0d1d57a750ea1c239e701e44e22aa9041ec7d538 Mon Sep 17 00:00:00 2001
From: Nick Lang <nick@nicklang.com>
Date: Wed, 10 Jan 2018 13:46:33 -0700
Subject: [PATCH 2/2] bump version travis uses for test

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fe0d55cf..3b4d44bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_install:
   - java -version
 
 install:
-  - curl -L -o /tmp/es-snap.zip https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0.zip
+  - curl -L -o /tmp/es-snap.zip https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.1.1.zip
   - unzip /tmp/es-snap.zip -d /tmp/
   - /tmp/elasticsearch-*/bin/elasticsearch -E path.repo=/tmp -E repositories.url.allowed_urls='http://*' -E node.attr.testattr=test -d
   - git clone https://github.com/elastic/elasticsearch.git ../elasticsearch