dev-python/elasticsearch-curator: bump to 4.2.5

2 files changed, 20 insertions, 20 deletions

diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 9c946f55bd47..75ea9946866f 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,5 +1,5 @@
 DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47
-DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6
+DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
 DIST elasticsearch-curator-4.0.6.tar.gz 110804 SHA256 e60f671dfa003f45f68320599cb15cee38cc61cb25899d903c2b29f2e3892e09 SHA512 b52af17d7d58bb9599095a00d03e5fda6bc7d9b401d100379f2a6969e5f995367192f33c045251518345abd86f2b143b1b086aab2c165d7e66efccb02dab8698 WHIRLPOOL 7621d883d59202882f455393ca7a87b39292667890dd2c5e3841ffb8a62e823d775794173a0205b02da24b7016509759c302bfabee5fc77a8000c961f853466f
 DIST elasticsearch-curator-4.1.2.tar.gz 130194 SHA256 f4ccc0d49790e0f9390982cc2f0c69ad385361e7840050b6ecba4ef70fa64a0d SHA512 4a465c03baea6b708ce38bbaea8c94a288f91db39fba253a3123af68bce94b1253d22f0d9214fc449a97d55ad468f7f78bf14993c0f5cf18fcf91ebbe1ec57cb WHIRLPOOL 73f8b59f08a6746468336aaac9217a4e37ee15e0deeaf9711d7af79585dfe4e18402d6dceb3feafbafec3e2609dbcc7df983555529640e046336e0bb7421f0d3
-DIST elasticsearch-curator-4.2.4.tar.gz 225965 SHA256 620667cb62e7fc04f8c41e3b11a0a66ccdae0ba6de1a65a6fa3fd748e6b29560 SHA512 dd85dd9a19c2371b3f731ef78259adaaedd39b944980ed11b89a076b53bbc74d44751acb050aeda7fbe47207ff457c7ba4cb7eba88967092e9c9a525d0a1380c WHIRLPOOL 034a17e72289a3b555d07be39ce1522819ef1d9ead0c20bfd88e6e2b44ac029bd9266215dcb0f55b7d5db4914d31d31240a9e94218aa8ef1cc36aea016f767fc
+DIST elasticsearch-curator-4.2.5.tar.gz 227607 SHA256 1a4869fcdbae062dd9777fece8265d5a493dc0e617f152b118955001604de7b8 SHA512 c43b45174098a33e68fedfd298c8377bf7541dafe4d6293311775325fd8ac3152f43fa0ea5beb1f8b459a3d0998167b2232564b2e11df6e1cff28afe0abc3dfc WHIRLPOOL f5176bfab80a8e7f05daf8634a6be984dcf4420615be773d58c74aa3060cb4b7c8052376653c28be7c2c6276251cc296929c35d4537aac46d600d7a0574a10c0
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.4.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.5.ebuild
index 5f0b8fa7d50b..ab01a2a02951 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.4.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 MY_PN="curator"
-ES_VERSION="5.1.1"
+ES_VERSION="5.1.2"
 
 inherit distutils-r1
 
@@ -32,7 +32,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
-		|| ( virtual/jre:1.8 virtual/jre:1.7 )
+		virtual/jre:1.8
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
@@ -41,31 +41,29 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
 python_test() {
 	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
 	ES_PORT="25123"
-	ES_LOG="${ES}/logs/elasticsearch.log"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
 	PID="${ES}/elasticsearch.pid"
 
 	# run Elasticsearch instance on custom port
 	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: gentoo-es-curator-test/g" \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
 		"${ES}/config/elasticsearch.yml" || die
 
-	# Elasticsearch 1.6+ needs to set path.repo
-	grep -q "^path.repo" "${ES}/config/elasticsearch.yml"
-	if [[ $? -ne 0 ]]; then
-		echo "path.repo: /" >> "${ES}/config/elasticsearch.yml" || die
-	fi
-
 	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" || die
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Edefault.path.repo=/ || die
 
 	local i
-	for i in {1..10}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
+	local es_started=0
+	for i in {1..15}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
 		if [[ $? -eq 0 ]]; then
 			einfo "Elasticsearch started"
+			es_started=1
 			eend 0
 			break
 		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
@@ -80,6 +78,8 @@ python_test() {
 		fi
 	done
 
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
 	esetup.py test || die
 
@@ -90,10 +90,10 @@ python_prepare_all() {
 	# avoid downloading from net
 	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
 
-	# test test_no_config fails because by default it connects
-	# to port 9200 and we run es on custom port
-	# https://github.com/elastic/curator/issues/843
-	sed -e '39,57d' -i test/integration/test_cli.py || die
+	# remove test TestCLIFixFor687 as it is only to be run on older versions
+	# and the call to curator.get_version(global_client) sometimes
+	# fails with Connection refused
+	sed -e '122,205d' -i test/integration/test_delete_indices.py || die
 
 	distutils-r1_python_prepare_all
 }