Merge lp:~ack/landscape-client/multi-curl-test-fix into lp:~landscape/landscape-client/trunk

[Alberto Donato]

Fix a flaky CURL-related test.
The MultiCurlStub wasn't really thread-safe, so it could break when used with fetch_many_async.

Fix a flaky CURL-related test.
The MultiCurlStub wasn't really thread-safe, so it could break when used with fetch_many_async.

[Free Ekanayaka (free.ekanayaka)]

+1

review: Approve

[Adam Collard (adam-collard)]

Looks good!

review: Approve

=== modified file 'landscape/lib/tests/test_fetch.py'
--- landscape/lib/tests/test_fetch.py	2014-12-04 09:48:07 +0000
+++ landscape/lib/tests/test_fetch.py	2015-06-08 08:21:25 +0000
@@ -1,4 +1,5 @@
 import os
+from threading import local
 
 import pycurl
 
@@ -54,23 +55,29 @@
             else:
                 body = result[0]
                 http_code = result[1]
-            self.curls[url] = CurlStub(body, {pycurl.HTTP_CODE: http_code})
-        self.current = None
+            self.curls[url] = CurlStub(
+                result=body, infos={pycurl.HTTP_CODE: http_code})
+
+        # Use thread local storage to keep the current CurlStub since
+        # CurlManyStub is passed to multiple threads, but the state needs to be
+        # local.
+        self._local = local()
+        self._local.current = None
 
     def getinfo(self, what):
-        if not self.current.performed:
+        if not self._local.current.performed:
             raise AssertionError("getinfo() can't be called before perform()")
-        result = self.current.getinfo(what)
-        self.current = None
+        result = self._local.current.getinfo(what)
+        self._local.current = None
         return result
 
     def setopt(self, option, value):
-        if option is pycurl.URL:
-            self.current = self.curls[value]
-        self.current.setopt(option, value)
+        if option == pycurl.URL:
+            self._local.current = self.curls[value]
+        self._local.current.setopt(option, value)
 
     def perform(self):
-        self.current.perform()
+        self._local.current.perform()
 
 
 class Any(object):