fix unit tests

thefab · Jul 4, 2015 · f72b2a7 · f72b2a7
1 parent 6aa2ad1
commit f72b2a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tornadis/pool.py b/tornadis/pool.py
@@ -96,7 +96,7 @@ def get_client_nowait(self):
             A Client instance (not necessary connected) as result (or None).
         """
         if self.__sem is not None:
-            if self.__sem.locked():
+            if self.__sem._value == 0:
                 return None
             self.__sem.acquire()
         _, client = self._get_client_from_pool_or_make_it()

diff --git a/tornadis/pubsub.py b/tornadis/pubsub.py
@@ -141,7 +141,7 @@ def pubsub_pop_message(self, deadline=None):
         try:
             reply = self._reply_list.pop(0)
         except IndexError:
-            yield self._condition.wait(deadline=deadline)
+            yield self._condition.wait(timeout=deadline)
         else:
             if reply is None:
                 try: