Merge pull request #1306 from untergeek/fix/ilm_check

Update ILM version minimum to 6.6.0
elastic · Oct 30, 2018 · b9eb361 · b9eb361
2 parents b172599 + ef47fb1
commit b9eb361
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -22,6 +22,7 @@ Changelog
   * Pin ``click`` version for compatibility. (Andrewsville) #1280
   * Allow much older epoch timestamps (rsteneteg) #1296
   * Reindex action respects ``ignore_empty_list`` flag (untergeek) #1297
+  * Update ILM index version minimum to 6.6.0 (untergeek)
 
 **Documentation**
 

diff --git a/test/integration/test_delete_indices.py b/test/integration/test_delete_indices.py
@@ -462,7 +462,7 @@ def test_name_negative_epoch(self):
         self.assertEquals(0, len(curator.get_indices(self.client)))
     def test_allow_ilm_indices_true(self):
         # ILM will not be added until 6.4
-        if curator.get_version(self.client) < (6,5,0):
+        if curator.get_version(self.client) < (6,6,0):
             self.assertTrue(True)
         else:
             self.create_indices(10)
@@ -489,7 +489,7 @@ def test_allow_ilm_indices_true(self):
             self.assertEquals(5, len(curator.get_indices(self.client)))
     def test_allow_ilm_indices_false(self):
         # ILM will not be added until 6.4
-        if curator.get_version(self.client) < (6,5,0):
+        if curator.get_version(self.client) < (6,6,0):
             self.assertTrue(True)
         else:
             self.create_indices(10)

diff --git a/test/unit/test_class_index_list.py b/test/unit/test_class_index_list.py
@@ -890,7 +890,7 @@ def test_unknown_filtertype_raises(self):
         )
     def test_ilm_filtertype_exclude(self):
         client = Mock()
-        client.info.return_value = {'version': {'number': '6.3.0'} }
+        client.info.return_value = {'version': {'number': '6.6.0'} }
         # If we don't deepcopy, then it munges the settings for future references.
         with_ilm = deepcopy(testvars.settings_two)
         with_ilm['index-2016.03.03']['settings']['index']['lifecycle'] = {'name':'mypolicy'}
@@ -903,7 +903,7 @@ def test_ilm_filtertype_exclude(self):
         self.assertEqual(['index-2016.03.04'], ilo.indices)
     def test_ilm_filtertype_no_setting(self):
         client = Mock()
-        client.info.return_value = {'version': {'number': '6.3.0'} }
+        client.info.return_value = {'version': {'number': '6.6.0'} }
         client.indices.get_settings.return_value = testvars.settings_two
         client.cluster.state.return_value = testvars.clu_state_two
         client.indices.stats.return_value = testvars.stats_two