Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(test): avoid racy reader vs writer contender in test_rw_lock #747

Merged
merged 1 commit into from
Mar 8, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions kazoo/tests/test_lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,27 +487,29 @@ def test_rw_lock(self):
lock = self.client.WriteLock(self.lockpath, "test")
lock.acquire()

wait = self.make_wait()
reader_thread.start()
# make sure reader_thread is a contender before writer_thread
wait(lambda: len(lock.contenders()) == 2)
writer_thread.start()

# wait for everyone to line up on the lock
wait = self.make_wait()
wait(lambda: len(lock.contenders()) == 3)
contenders = lock.contenders()

assert contenders[0] == "test"
remaining = contenders[1:]

# release the lock and contenders should claim it in order
lock.release()

contender_bits = {
"reader": (reader_thread, reader_event),
"writer": (writer_thread, writer_event),
}

for contender in ("reader", "writer"):
thread, event = contender_bits[contender]
# release the lock and contenders should claim it in order
lock.release()

for contender, contender_bits in contender_bits.items():
_, event = contender_bits

with self.condition:
while not self.active_thread:
Expand Down
Loading