Skip to content

Commit

Permalink
pythongh-111119: Fix flaky test test_lock_two_threads (pythongh-111124)
Browse files Browse the repository at this point in the history
  • Loading branch information
colesbury authored Oct 20, 2023
1 parent cb4f746 commit 264f4af
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions Modules/_testinternalcapi/test_lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,18 @@ test_lock_two_threads(PyObject *self, PyObject *obj)
assert(test_data.m.v == 1);

PyThread_start_new_thread(lock_thread, &test_data);
while (!_Py_atomic_load_int(&test_data.started)) {
pysleep(10);
}
pysleep(10); // allow some time for the other thread to try to lock

// wait up to two seconds for the lock_thread to attempt to lock "m"
int iters = 0;
uint8_t v;
do {
pysleep(10); // allow some time for the other thread to try to lock
v = _Py_atomic_load_uint8_relaxed(&test_data.m.v);
assert(v == 1 || v == 3);
iters++;
} while (v != 3 && iters < 200);

// both the "locked" and the "has parked" bits should be set
assert(test_data.m.v == 3);

PyMutex_Unlock(&test_data.m);
Expand Down

0 comments on commit 264f4af

Please sign in to comment.