Merge branch 'dockerize'

CHANGES.txt

@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+0.3 (12-15-2016)
+----------------
+
+- Dockerize tests
+
+- Reuse memcached connections in Client Pool #4
+
 0.2 (12-15-2015)
 ----------------
 

aiomcache/client.py

@@ -178,6 +178,8 @@ def stats(self, conn, args=None):
                 result[terms[1]] = None
             elif len(terms) == 3 and terms[0] == b'STAT':
                 result[terms[1]] = terms[2]
+            elif len(terms) >= 3 and terms[0] == b'STAT':
+                result[terms[1]] = b' '.join(terms[2:])
             else:
                 raise ClientException('stats failed', resp)
 

aiomcache/pool.py

@@ -47,6 +47,8 @@ def acquire(self):
                 if _conn.reader.at_eof() or _conn.reader.exception():
                     self._do_close(_conn)
                     conn = None
+                else:
+                    conn = _conn
 
             if conn is None:
                 conn = yield from self._create_new_conn()

tests/pool_test.py

@@ -57,3 +57,19 @@ def test_pool_is_full(mcache_params, loop):
     assert pool.size() == 3
     pool.release(conn)
     assert pool.size() == 2
+
+
+@pytest.mark.run_loop
+def test_acquire_dont_create_new_connection_if_have_conn_in_pool(mcache_params,
+                                                                 loop):
+    pool = MemcachePool(minsize=1, maxsize=5, loop=loop, **mcache_params)
+    assert pool.size() == 0
+
+    # Add a valid connection
+    _conn = yield from pool._create_new_conn()
+    yield from pool._pool.put(_conn)
+    assert pool.size() == 1
+
+    conn = yield from pool.acquire()
+    assert conn is _conn
+    assert pool.size() == 1