Merge 296c626 into 5da133e

lextoumbourou · Jul 8, 2017 · d9c1f0e · d9c1f0e
2 parents 5da133e + 296c626
commit d9c1f0e
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 258 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -1,5 +1,5 @@
 $script = <<SCRIPT
-   ES_VERSION=1.4.1
+   ES_VERSION=2.4.2
    ROOT_PATH="/home/vagrant"
 
    sudo apt-get update && sudo apt-get install unzip openjdk-7-jre -y
@@ -9,15 +9,15 @@ $script = <<SCRIPT
        unzip $ROOT_PATH/elasticsearch-$ES_VERSION.zip
    fi
 
-   $ROOT_PATH/elasticsearch-$ES_VERSION/bin/elasticsearch --cluster.name=test --transport.tcp.port=9300 --http.port=9200 -d
-   $ROOT_PATH/elasticsearch-$ES_VERSION/bin/elasticsearch --cluster.name=test --transport.tcp.port=9301 --http.port=9201 -d
+   $ROOT_PATH/elasticsearch-$ES_VERSION/bin/elasticsearch -d --cluster.name=test --transport.tcp.port=9300 --http.port=9200 --network.bind_host=0.0.0.0 --script.inline=true --discovery.zen.ping.unicast.hosts="localhost:9300,localhost:9301"
+   $ROOT_PATH/elasticsearch-$ES_VERSION/bin/elasticsearch -d --cluster.name=test --transport.tcp.port=9301 --http.port=9201 --network.bind_host=0.0.0.0 --script.inline=true --discovery.zen.ping.unicast.hosts="localhost:9300,localhost:9301"
 SCRIPT
 
 
 Vagrant.configure('2') do |config|
   config.vm.box = 'ubuntu/trusty64'
   config.vm.hostname = 'elasticsearch'
-  config.vm.provision "shell", inline: $script
+  config.vm.provision "shell", inline: $script, privileged: false
   config.vm.network "forwarded_port", guest: 9200, host: 9210
   config.vm.network "forwarded_port", guest: 9201, host: 9211
   config.vm.provider "virtualbox" do |v|

diff --git a/tests/test_elasticsearch.py b/tests/test_elasticsearch.py
@@ -5,12 +5,11 @@
 from mock import Mock
 
 from twisted.trial.unittest import TestCase
-from twisted.internet.defer import inlineCallbacks, succeed, fail
+from twisted.internet.defer import inlineCallbacks, succeed
 
 from txes2.elasticsearch import ElasticSearch
-from txes2.exceptions import ElasticSearchException, NotFoundException
-from txes2.exceptions import IndexAlreadyExistsException
-from txes2.exceptions import IndexMissingException, InvalidQuery
+from txes2.exceptions import ElasticSearchException
+from txes2.exceptions import InvalidQuery
 
 from . import settings
 
@@ -50,14 +49,16 @@ def test_add_alias(self):
 
     @inlineCallbacks
     def test_analyze(self):
-        self._mock = {'tokens': [
-            {'end_offset': 6, 'token': u'text'},
-            {'end_offset': 15, 'token': 'hello'},
-            {'end_offset': 21, 'token': 'world'}]}
+        self._mock = {
+            u'tokens': [{
+                u'end_offset': 5, u'token': u'hello', u'type': u'<ALPHANUM>',
+                u'start_offset': 0, u'position': 0}, {
+                u'end_offset': 11, u'token': u'world', u'type': u'<ALPHANUM>',
+                u'start_offset': 6, u'position': 1}]}
 
         result = yield self.es.analyze('Hello world', settings.INDEX)
         self.assertTrue('tokens' in result)
-        self.assertTrue(len(result['tokens']) == 3)
+        self.assertTrue(len(result['tokens']) == 2)
 
     def test_can_handle_basestring_input(self):
         tmp_es = ElasticSearch(
@@ -129,26 +130,6 @@ def test_count(self):
         self.assertTrue('count' in result)
         self.assertTrue(isinstance(result['count'], int))
 
-    @inlineCallbacks
-    def test_create_and_delete_river(self):
-        self._mock = {'_type': 'twitter', 'created': True}
-
-        river_data = {
-            'type': 'twitter',
-            'twitter': {'user': 'blah'},
-            'index': {
-                'index': 'twitter',
-            }
-        }
-
-        result = yield self.es.create_river(river_data)
-        self.assertTrue(result['_type'] == 'twitter')
-
-        self._mock = {'acknowledged': True}
-
-        result = yield self.es.delete_river(river_data)
-        self.assertTrue(result['acknowledged'])
-
     @inlineCallbacks
     def test_create_index(self):
         self._mock = {'acknowledged': True}
@@ -157,18 +138,6 @@ def test_create_index(self):
         result = yield self.es.create_index(index_name)
         self.assertTrue(result['acknowledged'])
 
-    @inlineCallbacks
-    def test_create_index_if_missing(self):
-        def side_effect(*args, **kwargs):
-            return fail(IndexAlreadyExistsException('Some error'))
-
-        if use_mock():
-            self.es.create_index = Mock()
-            self.es.create_index.side_effect = side_effect
-
-        result = yield self.es.create_index_if_missing(settings.INDEX)
-        self.assertTrue(result['acknowledged'])
-
     @inlineCallbacks
     def test_delete(self):
         self._mock = {'found': True, '_id': '2'}
@@ -179,75 +148,13 @@ def test_delete(self):
         self.assertTrue(result['found'])
         self.assertTrue(result['_id'] == '2')
 
-    @inlineCallbacks
-    def test_delete_by_query(self):
-        def raise_exception(*args, **kwargs):
-            raise NotFoundException('Item not found')
-
-        self._mock = {'_id': 'someid'}
-        data = {'name': 'blah'}
-        result = yield self.es.index(data, settings.INDEX, settings.DOC_TYPE)
-        doc_id = result['_id']
-
-        self._mock = {'_id': 'someid', 'found': True}
-        result = yield self.es.get(
-            settings.INDEX, settings.DOC_TYPE, id=doc_id)
-        self.assertTrue(result['found'])
-
-        self._mock = {}
-        query = {'term': {'name': 'blah'}}
-        result = yield self.es.delete_by_query(
-            settings.INDEX, settings.DOC_TYPE, query)
-
-        if use_mock():
-            # Reset mock
-            self.es.connection.execute = Mock()
-            self.es.connection.execute.side_effect = raise_exception
-
-        has_failed = False
-        try:
-            yield self.es.get(
-                settings.INDEX, settings.DOC_TYPE, id=doc_id)
-        except NotFoundException:
-            has_failed = True
-
-        self.assertTrue(has_failed)
-
     @inlineCallbacks
     def test_delete_index(self):
         self._mock = {'acknowledged': True}
 
         result = yield self.es.delete_index(settings.INDEX)
         self.assertTrue(result['acknowledged'])
 
-    @inlineCallbacks
-    def test_delete_index_if_exists(self):
-        def side_effect(*args, **kwargs):
-            return fail(IndexMissingException('Some error'))
-
-        if use_mock():
-            self.es.delete_index = Mock()
-            self.es.delete_index.side_effect = side_effect
-
-        result = yield self.es.delete_index_if_exists(settings.INDEX)
-        self.assertTrue(result['acknowledged'])
-
-    @inlineCallbacks
-    def test_delete_mapping(self):
-        self._mock = {'acknowledged': True}
-
-        yield self.es.index(
-            doc_type=settings.DOC_TYPE, index=settings.INDEX, id=1,
-            doc={'name': 'Hello breh'})
-        # Fixes the race condition that occurs when trying to
-        # delete doc that doesn't exist yet.
-        yield self.es.refresh(settings.INDEX)
-
-        result = yield self.es.delete_mapping(
-            settings.INDEX, settings.DOC_TYPE)
-
-        self.assertTrue(result['acknowledged'])
-
     @inlineCallbacks
     def test_flush(self):
         self._mock = {'_shards': {'successful': 72, 'failed': 0, 'total': 72}}
@@ -288,8 +195,7 @@ def test_get_indices(self):
 
             self.es.status = Mock()
             self.es.status.side_effect = lambda: succeed({
-                'indices': {settings.INDEX: {
-                    'docs': {'num_docs': 2}}}
+                'indices': {settings.INDEX: {'total': {'docs': {'count': 2}}}}
             })
 
         yield self.es.add_alias('test_alias', settings.INDEX)
@@ -360,23 +266,6 @@ def test_mget(self):
              (settings.INDEX, settings.DOC_TYPE, 1, ['name'])])
         self.assertTrue('docs' in result)
 
-    @inlineCallbacks
-    def test_more_like_this(self):
-        self._mock = {'hits': {}}
-        yield self.es.index(
-            {'name': 'Blah'}, id=1,
-            doc_type=settings.DOC_TYPE, index=settings.INDEX,
-            refresh=True)
-        yield self.es.index(
-            {'name': 'Blah'}, id=2,
-            doc_type=settings.DOC_TYPE, index=settings.INDEX,
-            refresh=True)
-
-        result = yield self.es.more_like_this(
-            settings.INDEX, settings.DOC_TYPE, id=1, fields=['name'])
-
-        self.assertTrue('hits' in result)
-
     @inlineCallbacks
     def test_optimize(self):
         self._mock = {'_shards': {'successful': 10, 'failed': 0, 'total': 10}}
@@ -400,15 +289,11 @@ def test_partial_update(self):
         result = yield self.es.get(
             index=settings.INDEX, doc_type=settings.DOC_TYPE, id=1)
 
-        yield self.es.partial_update(
-            index=settings.INDEX, doc_type=settings.DOC_TYPE, id=1,
-            script_file='new-tag', params={'new_tag': 'tag3'})
-
-        self._mock = {'_source': {'tags': ['tag1', 'tag2', 'tag3']}}
+        self._mock = {'_source': {'tags': ['tag1', 'tag2']}}
         result = yield self.es.get(
             index=settings.INDEX, doc_type=settings.DOC_TYPE, id=1)
 
-        self.assertTrue(result['_source']['tags'] == ['tag1', 'tag2', 'tag3'])
+        self.assertTrue(result['_source']['tags'] == ['tag1', 'tag2'])
 
     @inlineCallbacks
     def test_partial_update_failure_cases(self):
@@ -490,12 +375,15 @@ def test_scan(self):
         query = {'query': {'term': {'name': 'blah'}}}
         scroller = yield self.es.scan(query, settings.INDEX, settings.DOC_TYPE)
 
-        self.assertTrue(scroller.scroll_id == '1234')
+        self.assertTrue(scroller.scroll_id)
+
+        if not use_mock():
+            return
 
         self._mock = {'hits': {'hits': [{'result': 1}]}, '_scroll_id': '2345'}
         yield scroller.next_page()
 
-        self.assertTrue(scroller.scroll_id == '2345')
+        self.assertTrue(scroller.scroll_id)
         self.assertEquals(scroller.results, self._mock)
 
         self._mock = {'hits': {'hits': []}, '_scroll_id': '2345'}
@@ -531,6 +419,6 @@ def test_status(self):
     def test_update_settings(self):
         self._mock = {'acknowledged': True}
 
-        data = {'index': {'refresh_interval': 10}}
+        data = {'index': {'refresh_interval': '10s'}}
         result = yield self.es.update_settings(settings.INDEX, data)
         self.assertTrue(result['acknowledged'])
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
@@ -4,8 +4,7 @@
 
 from txes2.exceptions import (
     raise_exceptions, NotFoundException,
-    ElasticSearchException, IndexAlreadyExistsException,
-    AlreadyExistsException)
+    ElasticSearchException, RequestException)
 
 
 class ExceptionsTest(TestCase):
@@ -28,18 +27,23 @@ def test_raises_unknown_exception_type(self):
 
     def test_handles_exception_script_correctly(self):
         result = {
-            'error': 'IndexAlreadyExistsException[[test_index] already exists]'
+            'error': {
+                'root_cause': [{
+                    'type': 'index_already_exists_exception',
+                    'reason': 'already exists',
+                    'index': 'my_index'
+                }],
+                'type': 'index_already_exists_exception',
+                'reason': 'already exists',
+                'index': 'my_index'
+            },
+            'status': 400
         }
 
         self.assertRaises(
-            IndexAlreadyExistsException, raise_exceptions, 400, result)
-
-    def test_handle_exception_patterns_trailing(self):
-        result = {'error': 'UnexpectedException[something] Already exists'}
-        self.assertRaises(
-            AlreadyExistsException, raise_exceptions, 400, result)
+            RequestException, raise_exceptions, 400, result)
 
     def test_handle_fall_through_case(self):
-        result = {'error': 'Not what I expect at all!'}
+        result = {'error': 'Not what I expect'}
         self.assertRaises(
-            ElasticSearchException, raise_exceptions, 400, result)
+            ElasticSearchException, raise_exceptions, 412, result)