@@ -60,6 +60,9 @@ struct MockState {
6060 last_workspace_request : Mutex < Option < String > > ,
6161 get_calls : AtomicU32 ,
6262 phase_sequence : Vec < proto:: SandboxPhase > ,
63+ get_sandbox_id : Option < String > ,
64+ get_error : Option < Status > ,
65+ delete_response : Option < proto:: DeleteSandboxResponse > ,
6366 get_returns_not_found : bool ,
6467 not_found_after : Option < u32 > ,
6568 paginate_list : bool ,
@@ -344,6 +347,9 @@ impl OpenShell for TestOpenShell {
344347 selected_workspace ( & req. workspace_scope ) . map ( str:: to_string) ;
345348 let count = self . state . get_calls . fetch_add ( 1 , Ordering :: SeqCst ) ;
346349
350+ if let Some ( error) = & self . state . get_error {
351+ return Err ( error. clone ( ) ) ;
352+ }
347353 if self . state . get_returns_not_found {
348354 return Err ( Status :: not_found ( format ! ( "sandbox '{name}' not found" ) ) ) ;
349355 }
@@ -361,8 +367,12 @@ impl OpenShell for TestOpenShell {
361367 . or_else ( || self . state . phase_sequence . last ( ) . copied ( ) )
362368 . unwrap_or ( proto:: SandboxPhase :: Ready ) ;
363369
370+ let mut sandbox = sandbox_with_phase ( & name, phase) ;
371+ if let Some ( id) = & self . state . get_sandbox_id {
372+ sandbox. metadata . as_mut ( ) . unwrap ( ) . id . clone_from ( id) ;
373+ }
364374 Ok ( Response :: new ( proto:: SandboxResponse {
365- sandbox : Some ( sandbox_with_phase ( & name , phase ) ) ,
375+ sandbox : Some ( sandbox ) ,
366376 } ) )
367377 }
368378
@@ -436,6 +446,9 @@ impl OpenShell for TestOpenShell {
436446 * self . state . last_delete_name . lock ( ) . await = Some ( req. name ) ;
437447 * self . state . last_delete_workspace . lock ( ) . await =
438448 selected_workspace ( & req. workspace_scope ) . map ( str:: to_string) ;
449+ if let Some ( response) = & self . state . delete_response {
450+ return Ok ( Response :: new ( response. clone ( ) ) ) ;
451+ }
439452 Ok ( Response :: new ( proto:: DeleteSandboxResponse {
440453 sandbox_id : String :: new ( ) ,
441454 outcome : proto:: DeletionOutcome :: Completed . into ( ) ,
@@ -1289,19 +1302,154 @@ async fn wait_ready_surfaces_error_phase() {
12891302
12901303#[ tokio:: test]
12911304async fn wait_deleted_returns_when_get_reports_not_found ( ) {
1292- let state = Arc :: new ( MockState {
1293- phase_sequence : vec ! [ proto:: SandboxPhase :: Deleting ] ,
1294- not_found_after : Some ( 2 ) ,
1295- ..Default :: default ( )
1296- } ) ;
1297- let endpoint = start_mock ( state. clone ( ) ) . await ;
1298- let client = connect ( & endpoint) . await ;
1305+ for scoped in [ false , true ] {
1306+ for expected_id in [ None , Some ( "id-my-box" ) ] {
1307+ let state = Arc :: new ( MockState {
1308+ phase_sequence : vec ! [ proto:: SandboxPhase :: Deleting ] ,
1309+ not_found_after : Some ( 1 ) ,
1310+ ..Default :: default ( )
1311+ } ) ;
1312+ let endpoint = start_mock ( state. clone ( ) ) . await ;
1313+ let client = connect ( & endpoint) . await ;
1314+ let timeout = std:: time:: Duration :: from_secs ( 5 ) ;
1315+ if scoped {
1316+ client
1317+ . workspace ( "team" )
1318+ . wait_deleted ( "my-box" , timeout, expected_id)
1319+ . await
1320+ } else {
1321+ client. wait_deleted ( "my-box" , timeout, expected_id) . await
1322+ }
1323+ . unwrap ( ) ;
1324+ assert_eq ! ( state. get_calls. load( Ordering :: SeqCst ) , 2 ) ;
1325+ }
1326+ }
1327+ }
12991328
1300- client
1301- . wait_deleted ( "my-box" , std:: time:: Duration :: from_secs ( 5 ) )
1302- . await
1329+ #[ tokio:: test]
1330+ async fn wait_deleted_completes_on_replacement_after_accepted_deletion ( ) {
1331+ for scoped in [ false , true ] {
1332+ let state = Arc :: new ( MockState {
1333+ get_sandbox_id : Some ( "replacement-id" . to_string ( ) ) ,
1334+ delete_response : Some ( proto:: DeleteSandboxResponse {
1335+ outcome : proto:: DeletionOutcome :: Accepted . into ( ) ,
1336+ sandbox_id : "old-id" . to_string ( ) ,
1337+ } ) ,
1338+ ..Default :: default ( )
1339+ } ) ;
1340+ let endpoint = start_mock ( state. clone ( ) ) . await ;
1341+ let client = connect ( & endpoint) . await ;
1342+ let timeout = std:: time:: Duration :: from_millis ( 50 ) ;
1343+ let result = if scoped {
1344+ client
1345+ . workspace ( "team" )
1346+ . delete_sandbox ( "my-box" , openshell_sdk:: DeleteOptions :: default ( ) )
1347+ . await
1348+ } else {
1349+ client
1350+ . delete_sandbox ( "my-box" , openshell_sdk:: DeleteOptions :: default ( ) )
1351+ . await
1352+ }
13031353 . unwrap ( ) ;
1304- assert ! ( state. get_calls. load( Ordering :: SeqCst ) >= 3 ) ;
1354+ assert_eq ! ( result. outcome, openshell_sdk:: DeletionOutcome :: Accepted ) ;
1355+ assert_eq ! ( result. sandbox_id. as_deref( ) , Some ( "old-id" ) ) ;
1356+ if scoped {
1357+ client
1358+ . workspace ( "team" )
1359+ . wait_deleted ( "my-box" , timeout, result. sandbox_id . as_deref ( ) )
1360+ . await
1361+ } else {
1362+ client
1363+ . wait_deleted ( "my-box" , timeout, result. sandbox_id . as_deref ( ) )
1364+ . await
1365+ }
1366+ . unwrap ( ) ;
1367+ assert_eq ! ( state. get_calls. load( Ordering :: SeqCst ) , 1 ) ;
1368+ let workspace = if scoped { "team" } else { "default" } ;
1369+ assert_eq ! (
1370+ state. last_get_workspace. lock( ) . await . as_deref( ) ,
1371+ Some ( workspace)
1372+ ) ;
1373+ assert_eq ! (
1374+ state. last_delete_workspace. lock( ) . await . as_deref( ) ,
1375+ Some ( workspace)
1376+ ) ;
1377+ }
1378+ }
1379+
1380+ #[ tokio:: test]
1381+ async fn wait_deleted_does_not_complete_while_expected_identity_remains ( ) {
1382+ for scoped in [ false , true ] {
1383+ let state = Arc :: new ( MockState {
1384+ get_sandbox_id : Some ( "old-id" . to_string ( ) ) ,
1385+ ..Default :: default ( )
1386+ } ) ;
1387+ let endpoint = start_mock ( state. clone ( ) ) . await ;
1388+ let client = connect ( & endpoint) . await ;
1389+ let timeout = std:: time:: Duration :: ZERO ;
1390+ let error = if scoped {
1391+ client
1392+ . workspace ( "team" )
1393+ . wait_deleted ( "my-box" , timeout, Some ( "old-id" ) )
1394+ . await
1395+ } else {
1396+ client. wait_deleted ( "my-box" , timeout, Some ( "old-id" ) ) . await
1397+ }
1398+ . unwrap_err ( ) ;
1399+ assert_eq ! ( error. code( ) , "connect" ) ;
1400+ assert ! ( error. to_string( ) . contains( "timed out waiting" ) ) ;
1401+ assert_eq ! ( state. get_calls. load( Ordering :: SeqCst ) , 1 ) ;
1402+ }
1403+ }
1404+
1405+ #[ tokio:: test]
1406+ async fn wait_deleted_without_identity_waits_for_replacement_to_disappear ( ) {
1407+ for scoped in [ false , true ] {
1408+ let state = Arc :: new ( MockState {
1409+ get_sandbox_id : Some ( "replacement-id" . to_string ( ) ) ,
1410+ not_found_after : Some ( 1 ) ,
1411+ ..Default :: default ( )
1412+ } ) ;
1413+ let endpoint = start_mock ( state. clone ( ) ) . await ;
1414+ let client = connect ( & endpoint) . await ;
1415+ let timeout = std:: time:: Duration :: from_secs ( 5 ) ;
1416+ if scoped {
1417+ client
1418+ . workspace ( "team" )
1419+ . wait_deleted ( "my-box" , timeout, None )
1420+ . await
1421+ } else {
1422+ client. wait_deleted ( "my-box" , timeout, None ) . await
1423+ }
1424+ . unwrap ( ) ;
1425+ assert_eq ! ( state. get_calls. load( Ordering :: SeqCst ) , 2 ) ;
1426+ }
1427+ }
1428+
1429+ #[ tokio:: test]
1430+ async fn wait_deleted_propagates_errors_other_than_not_found ( ) {
1431+ for scoped in [ false , true ] {
1432+ for code in [ tonic:: Code :: PermissionDenied , tonic:: Code :: Unavailable ] {
1433+ let state = Arc :: new ( MockState {
1434+ get_error : Some ( Status :: new ( code, "lookup failed" ) ) ,
1435+ ..Default :: default ( )
1436+ } ) ;
1437+ let endpoint = start_mock ( state. clone ( ) ) . await ;
1438+ let client = connect ( & endpoint) . await ;
1439+ let timeout = std:: time:: Duration :: from_secs ( 5 ) ;
1440+ let error = if scoped {
1441+ client
1442+ . workspace ( "team" )
1443+ . wait_deleted ( "my-box" , timeout, Some ( "old-id" ) )
1444+ . await
1445+ } else {
1446+ client. wait_deleted ( "my-box" , timeout, Some ( "old-id" ) ) . await
1447+ }
1448+ . unwrap_err ( ) ;
1449+ assert_eq ! ( error. grpc_status( ) . unwrap( ) . code( ) , code) ;
1450+ assert_eq ! ( state. get_calls. load( Ordering :: SeqCst ) , 1 ) ;
1451+ }
1452+ }
13051453}
13061454
13071455#[ tokio:: test]
0 commit comments