@@ -29,7 +29,6 @@ const makeHome = () => {
2929 const launched : Array < ThreadLaunch . ThreadLaunchInput > = [ ] ;
3030 const sent : Array < ThreadManagement . ThreadManagementSendInput > = [ ] ;
3131 const dispatched : Array < OrchestrationV2ServerCommand > = [ ] ;
32- const interrupted : Array < ThreadId > = [ ] ;
3332 // Threads with a running turn, to model a Home that is busy when it is replaced.
3433 const running = new Set < string > ( ) ;
3534 const shell = ( threadId : ThreadId ) =>
@@ -74,10 +73,6 @@ const makeHome = () => {
7473 sent . push ( input ) ;
7574 return Effect . succeed ( { } as ThreadManagement . ThreadManagementSendResult ) ;
7675 } ,
77- interruptThread : ( input ) => {
78- interrupted . push ( input . threadId ) ;
79- return Effect . succeed ( { } as never ) ;
80- } ,
8176 dispatch : ( command ) => {
8277 dispatched . push ( command ) ;
8378 return Effect . succeed ( { } as never ) ;
@@ -86,7 +81,7 @@ const makeHome = () => {
8681 ) ,
8782 ) ,
8883 ) ;
89- return { layer, launched, sent, dispatched, sendFailures, interrupted , running } ;
84+ return { layer, launched, sent, dispatched, sendFailures, running } ;
9085} ;
9186
9287const event = ( threadId : string , kind : HomeWatchEvent [ "kind" ] ) : HomeWatchEvent => ( {
@@ -194,14 +189,14 @@ it.effect("a Home thread that a fresh start replaced cannot change watches", ()
194189 } ) . pipe ( Effect . provide ( layer ) ) ;
195190} ) ;
196191
197- it . effect ( "turning Home off stops the run the old Home was doing " , ( ) => {
198- const { layer, interrupted , running } = makeHome ( ) ;
192+ it . effect ( "turning Home off stops the old Home and holds its queued messages " , ( ) => {
193+ const { layer, dispatched , running } = makeHome ( ) ;
199194 return Effect . gen ( function * ( ) {
200195 const home = yield * HomeService . HomeService ;
201196 const { threadId } = yield * home . enable ( { modelSelection } ) ;
202197 running . add ( threadId ) ;
203198 yield * home . disable ;
204- expect ( interrupted ) . toEqual ( [ threadId ] ) ;
199+ expect ( dispatched ) . toMatchObject ( [ { type : "run.interrupt" , threadId, holdQueue : true } ] ) ;
205200 } ) . pipe ( Effect . provide ( layer ) ) ;
206201} ) ;
207202
0 commit comments