Skip to content

Commit ace5f49

Browse files
committed
test(rivetkit): remove sleepWithPreventSleep fixture and tests
1 parent d151463 commit ace5f49

4 files changed

Lines changed: 0 additions & 163 deletions

File tree

rivetkit-typescript/packages/rivetkit/fixtures/driver-test-suite/actors/sleepWithPreventSleep.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

rivetkit-typescript/packages/rivetkit/fixtures/driver-test-suite/registry-static.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ import {
8484
sleepRawWsAddEventListenerMessage,
8585
sleepWithLongRpc,
8686
sleepWithNoSleepOption,
87-
sleepWithPreventSleep,
8887
sleepWithRawHttp,
8988
sleepWithRawWebSocket,
9089
sleepWithWaitUntilMessage,
@@ -179,7 +178,6 @@ export const registry = setup({
179178
sleepWithRawHttp,
180179
sleepWithRawWebSocket,
181180
sleepWithNoSleepOption,
182-
sleepWithPreventSleep,
183181
sleepWithWaitUntilMessage,
184182
sleepRawWsAddEventListenerMessage,
185183
sleepRawWsAddEventListenerClose,

rivetkit-typescript/packages/rivetkit/fixtures/driver-test-suite/sleep.ts

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { promiseWithResolvers } from "rivetkit/utils";
33
import { scheduleActorSleep } from "./schedule-sleep";
44

55
export const SLEEP_TIMEOUT = 1000;
6-
export const PREVENT_SLEEP_TIMEOUT = 250;
76
export const RAW_WS_HANDLER_SLEEP_TIMEOUT = 100;
87
export const RAW_WS_HANDLER_DELAY = 250;
98

@@ -487,60 +486,3 @@ export const sleepWithNoSleepOption = actor({
487486
},
488487
});
489488

490-
export const sleepWithPreventSleep = actor({
491-
state: {
492-
startCount: 0,
493-
sleepCount: 0,
494-
preventSleepOnWake: false,
495-
delayPreventSleepDuringShutdown: false,
496-
preventSleepClearedDuringShutdown: false,
497-
},
498-
onWake: (c) => {
499-
c.state.startCount += 1;
500-
c.setPreventSleep(c.state.preventSleepOnWake);
501-
},
502-
onSleep: (c) => {
503-
c.state.sleepCount += 1;
504-
if (c.state.delayPreventSleepDuringShutdown) {
505-
c.setPreventSleep(true);
506-
setTimeout(() => {
507-
c.state.preventSleepClearedDuringShutdown = true;
508-
c.setPreventSleep(false);
509-
}, PREVENT_SLEEP_TIMEOUT / 2);
510-
}
511-
},
512-
actions: {
513-
triggerSleep: (c) => {
514-
c.sleep();
515-
},
516-
getStatus: (c) => {
517-
return {
518-
startCount: c.state.startCount,
519-
sleepCount: c.state.sleepCount,
520-
preventSleep: c.preventSleep,
521-
preventSleepOnWake: c.state.preventSleepOnWake,
522-
delayPreventSleepDuringShutdown:
523-
c.state.delayPreventSleepDuringShutdown,
524-
preventSleepClearedDuringShutdown:
525-
c.state.preventSleepClearedDuringShutdown,
526-
};
527-
},
528-
setPreventSleep: (c, prevent: boolean) => {
529-
c.setPreventSleep(prevent);
530-
return c.preventSleep;
531-
},
532-
setPreventSleepOnWake: (c, prevent: boolean) => {
533-
c.state.preventSleepOnWake = prevent;
534-
return c.state.preventSleepOnWake;
535-
},
536-
setDelayPreventSleepDuringShutdown: (c, enabled: boolean) => {
537-
c.state.delayPreventSleepDuringShutdown = enabled;
538-
c.state.preventSleepClearedDuringShutdown = false;
539-
return c.state.delayPreventSleepDuringShutdown;
540-
},
541-
},
542-
options: {
543-
sleepTimeout: SLEEP_TIMEOUT,
544-
sleepGracePeriod: PREVENT_SLEEP_TIMEOUT,
545-
},
546-
});

rivetkit-typescript/packages/rivetkit/tests/driver/actor-sleep.test.ts

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import { describe, expect, test, vi } from "vitest";
44
import {
5-
PREVENT_SLEEP_TIMEOUT,
65
RAW_WS_HANDLER_DELAY,
76
RAW_WS_HANDLER_SLEEP_TIMEOUT,
87
SLEEP_TIMEOUT,
@@ -593,105 +592,6 @@ describeDriverMatrix("Actor Sleep", (driverTestConfig) => {
593592
}
594593
});
595594

596-
test("preventSleep blocks auto sleep until cleared", async (c) => {
597-
const { client } = await setupDriverTest(c, driverTestConfig);
598-
599-
const sleepActor = client.sleepWithPreventSleep.getOrCreate();
600-
601-
{
602-
const status = await sleepActor.getStatus();
603-
expect(status.sleepCount).toBe(0);
604-
expect(status.startCount).toBe(1);
605-
expect(status.preventSleep).toBe(false);
606-
expect(status.preventSleepOnWake).toBe(false);
607-
}
608-
609-
expect(await sleepActor.setPreventSleep(true)).toBe(true);
610-
await waitFor(driverTestConfig, SLEEP_TIMEOUT + 250);
611-
612-
{
613-
const status = await sleepActor.getStatus();
614-
expect(status.sleepCount).toBe(0);
615-
expect(status.startCount).toBe(1);
616-
expect(status.preventSleep).toBe(true);
617-
}
618-
619-
expect(await sleepActor.setPreventSleep(false)).toBe(false);
620-
await waitFor(driverTestConfig, SLEEP_TIMEOUT * 3);
621-
622-
{
623-
const status = await sleepActor.getStatus();
624-
expect(status.sleepCount).toBe(1);
625-
expect(status.startCount).toBe(2);
626-
expect(status.preventSleep).toBe(false);
627-
}
628-
});
629-
630-
test("preventSleep delays shutdown until cleared", async (c) => {
631-
const { client } = await setupDriverTest(c, driverTestConfig);
632-
633-
const sleepActor = client.sleepWithPreventSleep.getOrCreate([
634-
"prevent-sleep-shutdown-delay",
635-
]);
636-
637-
expect(
638-
await sleepActor.setDelayPreventSleepDuringShutdown(true),
639-
).toBe(true);
640-
await sleepActor.triggerSleep();
641-
await waitFor(driverTestConfig, PREVENT_SLEEP_TIMEOUT + 150);
642-
643-
{
644-
const status = await sleepActor.getStatus();
645-
expect(status.sleepCount).toBe(1);
646-
expect(status.startCount).toBe(2);
647-
expect(status.preventSleep).toBe(false);
648-
expect(status.delayPreventSleepDuringShutdown).toBe(true);
649-
expect(status.preventSleepClearedDuringShutdown).toBe(true);
650-
}
651-
});
652-
653-
test("preventSleep can be restored during onWake", async (c) => {
654-
const { client } = await setupDriverTest(c, driverTestConfig);
655-
656-
const sleepActor = client.sleepWithPreventSleep.getOrCreate();
657-
658-
expect(await sleepActor.setPreventSleepOnWake(true)).toBe(true);
659-
660-
await sleepActor.triggerSleep();
661-
await waitFor(driverTestConfig, 250);
662-
663-
{
664-
const status = await sleepActor.getStatus();
665-
expect(status.sleepCount).toBe(1);
666-
expect(status.startCount).toBe(2);
667-
expect(status.preventSleep).toBe(true);
668-
expect(status.preventSleepOnWake).toBe(true);
669-
}
670-
671-
await waitFor(driverTestConfig, SLEEP_TIMEOUT + 250);
672-
673-
{
674-
const status = await sleepActor.getStatus();
675-
expect(status.sleepCount).toBe(1);
676-
expect(status.startCount).toBe(2);
677-
expect(status.preventSleep).toBe(true);
678-
expect(status.preventSleepOnWake).toBe(true);
679-
}
680-
681-
expect(await sleepActor.setPreventSleepOnWake(false)).toBe(false);
682-
expect(await sleepActor.setPreventSleep(false)).toBe(false);
683-
684-
await waitFor(driverTestConfig, SLEEP_TIMEOUT + 250);
685-
686-
{
687-
const status = await sleepActor.getStatus();
688-
expect(status.sleepCount).toBe(2);
689-
expect(status.startCount).toBe(3);
690-
expect(status.preventSleep).toBe(false);
691-
expect(status.preventSleepOnWake).toBe(false);
692-
}
693-
});
694-
695595
test("async websocket addEventListener message handler delays sleep", async (c) => {
696596
const { client } = await setupDriverTest(c, driverTestConfig);
697597

0 commit comments

Comments
 (0)