Updated tests to work with 1.0

This commit is contained in:
Honza Král
2014-01-18 01:54:30 +01:00
parent 2a5c53c6f9
commit 4adad8dc78
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -114,7 +114,7 @@ class ElasticTestCase(TestCase):
self.client = ElasticTestCase.client self.client = ElasticTestCase.client
def tearDown(self): def tearDown(self):
self.client.indices.delete() self.client.indices.delete('*')
try: try:
self.client.indices.delete_template('*') self.client.indices.delete_template('*')
except NotFoundError: except NotFoundError:
@@ -13,7 +13,7 @@ class TestMemcachedConnection(ElasticTestCase):
except ImportError: except ImportError:
raise SkipTest("No pylibmc.") raise SkipTest("No pylibmc.")
super(TestMemcachedConnection, self).setUp() super(TestMemcachedConnection, self).setUp()
nodes = self.client.cluster.node_info() nodes = self.client.nodes.info()
for node_id, node_info in nodes["nodes"].items(): for node_id, node_info in nodes["nodes"].items():
if 'memcached_address' in node_info: if 'memcached_address' in node_info:
connection_info = ADDRESS_RE.search(node_info['memcached_address']).groupdict() connection_info = ADDRESS_RE.search(node_info['memcached_address']).groupdict()