Merge pull request woocommerce#5 from canassa/add-timeout-parameter

claudiosanches · claudiosanches · commit 59bddcfd0df7 · 2015-09-25T15:59:05.000+02:00
Added timeout parameter
diff --git a/tests.py b/tests.py
@@ -44,6 +44,27 @@ def test_with_ssl(self):
         )
         self.assertTrue(api.is_ssl, True)
 
+    def test_with_timeout(self):
+        """ Test non-ssl """
+        api = woocommerce.API(
+            url="https://woo.test",
+            consumer_key=self.consumer_key,
+            consumer_secret=self.consumer_secret,
+            timeout=10,
+        )
+        self.assertEqual(api.timeout, 10)
+
+        @all_requests
+        def woo_test_mock(*args, **kwargs):
+            """ URL Mock """
+            return {'status_code': 200,
+                    'content': 'OK'}
+
+        with HTTMock(woo_test_mock):
+            # call requests
+            status = api.get("products").status_code
+        self.assertEqual(status, 200)
+
     def test_get(self):
         """ Test GET requests """
         @all_requests
diff --git a/woocommerce/api.py b/woocommerce/api.py
@@ -23,6 +23,7 @@ def __init__(self, url, consumer_key, consumer_secret, **kwargs):
         self.consumer_secret = consumer_secret
         self.version = kwargs.get("version", "v3")
         self.is_ssl = self.__is_ssl()
+        self.timeout = kwargs.get("timeout")
         self.verify_ssl = kwargs.get("verify_ssl", True)
 
     def __is_ssl(self):
@@ -74,6 +75,7 @@ def __request(self, method, endpoint, data):
             verify=self.verify_ssl,
             auth=auth,
             data=data,
+            timeout=self.timeout,
             headers=headers
         )
 
