@@ -256,6 +256,7 @@ fn keep_going_collects_results() {
256
256
opts,
257
257
"make_mixed_without_submodules" ,
258
258
|_id| {
259
+ dbg ! ( _id) ;
259
260
!matches ! (
260
261
count. fetch_update( Ordering :: SeqCst , Ordering :: SeqCst , |current| {
261
262
( current < 2 ) . then_some( current + 1 )
@@ -290,7 +291,11 @@ fn keep_going_collects_results() {
290
291
}
291
292
292
293
if multi_threaded ( ) {
293
- assert_eq ! ( dir_structure( & destination) . len( ) , 3 ) ;
294
+ let actual = dir_structure ( & destination) ;
295
+ if actual. len ( ) != 3 {
296
+ dbg ! ( destination. into_path( ) ) ;
297
+ }
298
+ assert_eq ! ( actual. len( ) , 3 ) ;
294
299
} else {
295
300
assert_eq ! (
296
301
stripped_prefix( & destination, & dir_structure( & destination) ) ,
@@ -336,6 +341,7 @@ fn collisions_are_detected_on_a_case_insensitive_filesystem_even_with_delayed_fi
336
341
eprintln ! ( "Skipping case-insensitive testing on what would be a case-sensitive file system" ) ;
337
342
return ;
338
343
}
344
+ assert_eq ! ( opts. keep_going, false ) ;
339
345
setup_filter_pipeline ( opts. filters . options_mut ( ) ) ;
340
346
opts. filter_process_delay = gix_filter:: driver:: apply:: Delay :: Allow ;
341
347
let ( source_tree, destination, _index, outcome) =
@@ -350,10 +356,9 @@ fn collisions_are_detected_on_a_case_insensitive_filesystem_even_with_delayed_fi
350
356
351
357
let dest_files = dir_structure ( & destination) ;
352
358
if multi_threaded ( ) {
353
- assert_eq ! (
354
- dest_files. len( ) ,
355
- 5 ,
356
- "can only assert on number as it's racily creating files so unclear which one clashes"
359
+ assert ! (
360
+ dest_files. len( ) <= 6 ,
361
+ "can only assert on vague number as it's racily creating files, with the collision stopping the operation at any time"
357
362
) ;
358
363
} else {
359
364
assert_eq ! (
@@ -370,10 +375,9 @@ fn collisions_are_detected_on_a_case_insensitive_filesystem_even_with_delayed_fi
370
375
let error_kind_dir = error_kind;
371
376
372
377
if multi_threaded ( ) {
373
- assert_eq ! (
374
- outcome. collisions. len( ) ,
375
- 5 ,
376
- "can only assert on number as it's racily creating files so unclear which one clashes"
378
+ assert ! (
379
+ outcome. collisions. len( ) <= 6 ,
380
+ "can only assert on number as it's racily creating files so unclear which one clashes and how many it sees - keep-going is false"
377
381
) ;
378
382
} else {
379
383
assert_eq ! (
@@ -477,6 +481,7 @@ fn checkout_index_in_tmp_dir_opts(
477
481
if allow_return_object ( oid) {
478
482
odb. find_blob ( oid, buf)
479
483
} else {
484
+ dbg ! ( oid) ;
480
485
Err ( gix_odb:: find:: existing_object:: Error :: NotFound { oid : oid. to_owned ( ) } )
481
486
}
482
487
} ,
0 commit comments