Merge remote-tracking branch 'origin/fix'

Closes #3

pystalk/client.py

@@ -386,8 +386,9 @@ def reserve_job(self, timeout=5):
         :type timeout: int
         """
         timeout = int(timeout)
-        if timeout >= self.socket_timeout:
-            raise ValueError('reserve_job timeout must be < socket timeout')
+        if self.socket_timeout is not None:
+            if timeout >= self.socket_timeout:
+                raise ValueError('reserve_job timeout must be < socket timeout')
         if not self._watchlist:
             raise ValueError('Select a tube or two before reserving a job')
         with self._sock_ctx() as socket:

tests/integration/test_basic.py

@@ -1,6 +1,7 @@
 import pytest
 
 from pystalk import BeanstalkError
+import pystalk
 
 
 def test_simple_flow(beanstalk_client, tube_name):
@@ -170,3 +171,20 @@ def test_using(beanstalk_client, tube_name):
 def test_put_job_into(beanstalk_client, tube_name):
     beanstalk_client.put_job_into(tube_name, 'some_job')
     assert beanstalk_client.stats_tube(tube_name)['current-jobs-ready'] == 1
+
+
+def test_socket_timeout(beanstalkd, tube_name):
+    host, port = beanstalkd
+    client = pystalk.BeanstalkClient(host, port, socket_timeout=10)
+    client.put_job_into(tube_name, 'some_job')
+    client.watch(tube_name)
+    with pytest.raises(ValueError):
+        client.reserve_job(timeout=11)
+    client.reserve_job(timeout=1)
+
+def test_socket_timeout_none(beanstalkd, tube_name):
+    host, port = beanstalkd
+    client = pystalk.BeanstalkClient(host, port, socket_timeout=None)
+    client.put_job_into(tube_name, 'some_job')
+    client.watch(tube_name)
+    client.reserve_job(timeout=11)