Fixing race condition in Pub / Sub system tests. (googleapis#4632)

dhermes · web-flow · commit 4e690876b049 · 2017-12-20T09:33:03.000-08:00
This was a programming error on my part (using a brand
new lock every time it was held).
diff --git a/pubsub/tests/system.py b/pubsub/tests/system.py
@@ -187,11 +187,12 @@ class AckCallback(object):
 
     def __init__(self):
         self.calls = 0
+        self.lock = threading.Lock()
 
     def __call__(self, message):
         message.ack()
         # Only increment the number of calls **after** finishing.
-        with threading.Lock():
+        with self.lock:
             self.calls += 1
 
 
@@ -201,13 +202,14 @@ def __init__(self, sleep_time):
         self.sleep_time = sleep_time
         self.calls = 0
         self.call_times = []
+        self.lock = threading.Lock()
 
     def __call__(self, message):
         now = datetime.datetime.now()
         time.sleep(self.sleep_time)
         message.ack()
         # Only increment the number of calls **after** finishing.
-        with threading.Lock():
+        with self.lock:
             # list.append() is thread-safe, but we still wait until
             # ``calls`` is incremented to do it.
             self.call_times.append(now)
