From 1378073e2d7e187167b3eb7372f202d4c7ae8e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Sun, 11 Oct 2015 04:50:31 +0200 Subject: [PATCH] Moved helpers unit tests to test_helpers --- test_elasticsearch/test_helpers.py | 11 +++++++++++ test_elasticsearch/test_server/test_helpers.py | 15 +-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/test_elasticsearch/test_helpers.py b/test_elasticsearch/test_helpers.py index f62c76b8..24f2073b 100644 --- a/test_elasticsearch/test_helpers.py +++ b/test_elasticsearch/test_helpers.py @@ -3,6 +3,7 @@ import time import threading from elasticsearch import helpers, Elasticsearch +from elasticsearch.serializer import JSONSerializer from .test_cases import TestCase @@ -25,3 +26,13 @@ class TestParallelBulk(TestCase): self.assertTrue(len(set([r[1] for r in results])) > 1) +class TestChunkActions(TestCase): + def setUp(self): + super(TestChunkActions, self).setUp() + self.actions = [({'index': {}}, {'some': 'data', 'i': i}) for i in range(100)] + + def test_chunks_are_chopped_by_byte_size(self): + self.assertEquals(100, len(list(helpers._chunk_actions(self.actions, 100000, 1, JSONSerializer())))) + + def test_chunks_are_chopped_by_chunk_size(self): + self.assertEquals(10, len(list(helpers._chunk_actions(self.actions, 10, 99999999, JSONSerializer())))) diff --git a/test_elasticsearch/test_server/test_helpers.py b/test_elasticsearch/test_server/test_helpers.py index 292815f9..2b2f2b1e 100644 --- a/test_elasticsearch/test_server/test_helpers.py +++ b/test_elasticsearch/test_server/test_helpers.py @@ -1,20 +1,7 @@ from elasticsearch import helpers, TransportError -from elasticsearch.serializer import JSONSerializer from . import ElasticsearchTestCase -from ..test_cases import SkipTest, TestCase - - -class TestChunkActions(TestCase): - def setUp(self): - super(TestChunkActions, self).setUp() - self.actions = [({'index': {}}, {'some': 'data', 'i': i}) for i in range(100)] - - def test_chunks_are_chopped_by_byte_size(self): - self.assertEquals(100, len(list(helpers._chunk_actions(self.actions, 100000, 1, JSONSerializer())))) - - def test_chunks_are_chopped_by_chunk_size(self): - self.assertEquals(10, len(list(helpers._chunk_actions(self.actions, 10, 99999999, JSONSerializer())))) +from ..test_cases import SkipTest class FailingBulkClient(object):