@@ -13,6 +13,9 @@ const CREATE_TIMEOUT: Duration = Duration::from_mins(10);
1313const COMMAND_TIMEOUT : Duration = Duration :: from_mins ( 2 ) ;
1414const TRANSITION_TIMEOUT : Duration = Duration :: from_mins ( 4 ) ;
1515const TRANSITION_INTERVAL : Duration = Duration :: from_secs ( 2 ) ;
16+ const RELAY_ATTACHMENT_TIMEOUT : Duration = Duration :: from_secs ( 30 ) ;
17+ const RELAY_SANDBOX_ATTEMPTS : usize = 6 ;
18+ const RELAY_SCENARIO_CONCURRENCY : usize = 2 ;
1619
1720#[ derive( Debug , Deserialize ) ]
1821struct SandboxState {
@@ -23,17 +26,151 @@ struct SandboxState {
2326/// Certify sandbox stop, start, and deletion lifecycle behavior.
2427pub const SANDBOX_LIFECYCLE_SCENARIO : Scenario = Scenario {
2528 name : "sandbox-lifecycle" ,
26- description : "Verify sandbox stop, start, and deletion lifecycle behavior ." ,
29+ description : "Verify sandbox state transitions and relay readiness across reconnects ." ,
2730 run : run_sandbox_lifecycle,
2831} ;
2932
33+ /// Certify sandbox stop, start, workspace preservation, and deletion behavior.
34+ pub const SANDBOX_LIFECYCLE_STATE_TRANSITIONS_SCENARIO : Scenario = Scenario {
35+ name : "sandbox-lifecycle/state-transitions" ,
36+ description : "Verify sandbox stop, start, workspace preservation, and deletion behavior." ,
37+ run : run_state_transitions,
38+ } ;
39+
40+ /// Certify that relay-backed commands remain available across startup reconnects.
41+ pub const SANDBOX_LIFECYCLE_RELAY_READINESS_SCENARIO : Scenario = Scenario {
42+ name : "sandbox-lifecycle/relay-readiness" ,
43+ description : "Verify attachments survive supervisor reconnects during sandbox startup." ,
44+ run : run_relay_readiness,
45+ } ;
46+
3047fn run_sandbox_lifecycle ( runner : & mut OpenShellRunner ) -> ScenarioFuture < ' _ > {
48+ Box :: pin ( async move {
49+ SANDBOX_LIFECYCLE_STATE_TRANSITIONS_SCENARIO
50+ . run ( runner)
51+ . await ?;
52+ SANDBOX_LIFECYCLE_RELAY_READINESS_SCENARIO . run ( runner) . await
53+ } )
54+ }
55+
56+ fn run_state_transitions ( runner : & mut OpenShellRunner ) -> ScenarioFuture < ' _ > {
3157 Box :: pin ( async move {
3258 stop_start_preserves_workspace ( runner) . await ?;
3359 stopped_can_be_deleted ( runner) . await
3460 } )
3561}
3662
63+ fn run_relay_readiness ( runner : & mut OpenShellRunner ) -> ScenarioFuture < ' _ > {
64+ Box :: pin ( async move { relay_readiness_survives_reconnects ( runner) . await } )
65+ }
66+
67+ async fn relay_readiness_survives_reconnects ( runner : & mut OpenShellRunner ) -> Result < ( ) , String > {
68+ for first_attempt in ( 1 ..=RELAY_SANDBOX_ATTEMPTS ) . step_by ( RELAY_SCENARIO_CONCURRENCY ) {
69+ let second_attempt = first_attempt + 1 ;
70+ let first_name = relay_sandbox_name ( runner, first_attempt) ;
71+ let second_name = relay_sandbox_name ( runner, second_attempt) ;
72+ runner. track_sandbox ( & first_name) ;
73+ runner. track_sandbox ( & second_name) ;
74+
75+ let ( first, second) = tokio:: join!(
76+ relay_readiness_attempt( runner, first_attempt, & first_name) ,
77+ relay_readiness_attempt( runner, second_attempt, & second_name) ,
78+ ) ;
79+ first?;
80+ second?;
81+ wait_for_absence (
82+ runner,
83+ & first_name,
84+ & format ! ( "relay-readiness/attempt-{first_attempt}/deleted" ) ,
85+ )
86+ . await ?;
87+ wait_for_absence (
88+ runner,
89+ & second_name,
90+ & format ! ( "relay-readiness/attempt-{second_attempt}/deleted" ) ,
91+ )
92+ . await ?;
93+ runner. forget_sandbox ( & first_name) ;
94+ runner. forget_sandbox ( & second_name) ;
95+ }
96+ Ok ( ( ) )
97+ }
98+
99+ fn relay_sandbox_name ( runner : & OpenShellRunner , attempt : usize ) -> String {
100+ format ! ( "ct-{}-rr-{attempt}" , runner. id( ) )
101+ }
102+
103+ async fn relay_readiness_attempt (
104+ runner : & OpenShellRunner ,
105+ attempt : usize ,
106+ sandbox_name : & str ,
107+ ) -> Result < ( ) , String > {
108+ let marker = format ! ( "relay-ready-{}-{attempt}" , runner. id( ) ) ;
109+ // Match the ordering that exposed the original race: detached creation
110+ // returns while the sandbox is still starting, then the attachment opens
111+ // against the first supervisor session before its startup reconnect.
112+ let main = format ! ( "printf '%s\\ n' '{marker}'; sleep 5" ) ;
113+ let create_command = runner
114+ . step ( format ! ( "relay-readiness/attempt-{attempt}/create" ) )
115+ . description ( format ! ( "sandbox '{sandbox_name}' is created" ) )
116+ . with_timeout ( CREATE_TIMEOUT ) ;
117+ let create_args = [
118+ "sandbox" ,
119+ "create" ,
120+ "--name" ,
121+ sandbox_name,
122+ "--detach" ,
123+ "--" ,
124+ "sh" ,
125+ "-c" ,
126+ & main,
127+ ] ;
128+ create_command
129+ . run ( & create_args)
130+ . await
131+ . map_err ( |error| error. to_string ( ) ) ?
132+ . require_success ( ) ?;
133+ relay_connect (
134+ runner,
135+ sandbox_name,
136+ & format ! ( "attempt-{attempt}/initial" ) ,
137+ & marker,
138+ )
139+ . await ?;
140+
141+ run_lifecycle_command (
142+ runner,
143+ "delete" ,
144+ sandbox_name,
145+ & format ! ( "relay-readiness/attempt-{attempt}/delete" ) ,
146+ )
147+ . await ?;
148+ Ok ( ( ) )
149+ }
150+
151+ async fn relay_connect (
152+ runner : & OpenShellRunner ,
153+ sandbox_name : & str ,
154+ cycle : & str ,
155+ marker : & str ,
156+ ) -> Result < ( ) , String > {
157+ let result = runner
158+ . step ( format ! ( "relay-readiness/{cycle}/connect" ) )
159+ . description ( format ! (
160+ "attachment reaches sandbox '{sandbox_name}' during its startup reconnect window"
161+ ) )
162+ . with_timeout ( RELAY_ATTACHMENT_TIMEOUT )
163+ . run ( & [ "sandbox" , "connect" , sandbox_name] )
164+ . await
165+ . map_err ( |error| error. to_string ( ) ) ?;
166+ result. require_success ( ) ?;
167+ if result. stdout ( ) . lines ( ) . any ( |line| line == marker) {
168+ Ok ( ( ) )
169+ } else {
170+ Err ( result. failure_diagnostic ( & format ! ( "stdout contains marker {marker:?}" ) ) )
171+ }
172+ }
173+
37174async fn stop_start_preserves_workspace ( runner : & mut OpenShellRunner ) -> Result < ( ) , String > {
38175 let sandbox_name = format ! ( "ct-{}-ss" , runner. id( ) ) ;
39176 let sentinel = format ! ( "openshell-stop-start-{}" , runner. id( ) ) ;
0 commit comments