Merge branch 'master' into priority

DirtyHairy · Feb 2, 2024 · c546c3f · c546c3f
2 parents 7aacdc7 + 6a55acb
commit c546c3f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/test/semaphoreSuite.ts b/test/semaphoreSuite.ts
@@ -115,6 +115,24 @@ export const semaphoreSuite = (factory: (maxConcurrency: number, err?: Error) =>
         assert.deepStrictEqual(values, [0, 0, +1, -1]);
     });
 
+    test('acquire allows light items to run eventually', async () => {
+        let done = false;
+        async function lightLoop() {
+            while (!done) {
+                const [,release] = await semaphore.acquire(1);
+                await new Promise((resolve) => { setTimeout(resolve, 10); });
+                release();
+            }
+        }
+        lightLoop();
+        await clock.tickAsync(5);
+        lightLoop();
+        semaphore.acquire(2).then(() => { done = true; });
+        await clock.tickAsync(10);
+        await clock.tickAsync(10);
+        assert.strictEqual(done, true);
+    });
+
     test('acquire blocks when the semaphore has reached zero until it is released again', async () => {
         const values: Array<number> = [];
 

diff --git a/test/withTimeout.ts b/test/withTimeout.ts
@@ -119,11 +119,14 @@ suite('withTimeout', () => {
 
             test('waitForUnlock times out', async () => {
                 mutex.acquire();
-                const unlockPromise = mutex.waitForUnlock();
+                let state = 'PENDING';
 
+                mutex.waitForUnlock()
+                    .then(() => { state = 'RESOLVED'; })
+                    .catch(() => { state = 'REJECTED'; });
                 await clock.tickAsync(120);
 
-                assert.rejects(unlockPromise, error);
+                assert.strictEqual(state, 'REJECTED');
             });
         });
 
@@ -255,11 +258,14 @@ suite('withTimeout', () => {
 
             test('waitForUnlock times out', async () => {
                 semaphore.acquire(2);
-                const unlockPromise = semaphore.waitForUnlock();
+                let state = 'PENDING';
 
-                await clock.tickAsync(120);
+                semaphore.waitForUnlock()
+                    .then(() => { state = 'RESOLVED'; })
+                    .catch(() => { state = 'REJECTED'; });
 
-                assert.rejects(unlockPromise, error);
+                await clock.tickAsync(120);
+                assert.strictEqual(state, 'REJECTED');
             });
         });