@@ -49,6 +49,47 @@ use std::path::PathBuf;
4949
5050const SOURCE_SEC : f64 = 4.0 ;
5151
52+ /// Isolate generated outputs from fixtures and remove them during unwinding.
53+ struct TestOutputDir ( PathBuf ) ;
54+
55+ impl TestOutputDir {
56+ fn new ( label : & str ) -> Self {
57+ let nonce = std:: time:: SystemTime :: now ( )
58+ . duration_since ( std:: time:: UNIX_EPOCH )
59+ . expect ( "system clock" )
60+ . as_nanos ( ) ;
61+ let path =
62+ std:: env:: temp_dir ( ) . join ( format ! ( "openscreen-{label}-{}-{nonce}" , std:: process:: id( ) ) ) ;
63+ std:: fs:: create_dir ( & path) . expect ( "isolated test output directory" ) ;
64+ Self ( path)
65+ }
66+ }
67+
68+ impl Drop for TestOutputDir {
69+ fn drop ( & mut self ) {
70+ if let Err ( error) = std:: fs:: remove_dir_all ( & self . 0 ) {
71+ eprintln ! ( "Could not clean test output directory: {error}" ) ;
72+ }
73+ }
74+ }
75+
76+ /// Failed export assertions must not leave files in a caller's fixture directory.
77+ #[ test]
78+ fn test_output_directory_is_removed_during_unwinding ( ) {
79+ let outputs = TestOutputDir :: new ( "cleanup-unwind" ) ;
80+ let path = outputs. 0 . clone ( ) ;
81+ std:: fs:: write ( path. join ( "partial.mp4" ) , b"incomplete export" ) . expect ( "seed output" ) ;
82+ let result = std:: panic:: catch_unwind ( move || {
83+ let _outputs = outputs;
84+ panic ! ( "simulate a failed export assertion" ) ;
85+ } ) ;
86+ assert ! ( result. is_err( ) ) ;
87+ assert ! (
88+ !path. exists( ) ,
89+ "failed tests must remove their output directory"
90+ ) ;
91+ }
92+
5293/// Per-frame local colour tables, in order, from a GIF89a file.
5394///
5495/// Enough of the format to walk block-to-block: extensions are skipped by
@@ -443,8 +484,8 @@ fn mp4_export_rejects_a_start_inside_a_multisecond_video_gap() {
443484 eprintln ! ( "skipped: set OPENSCREEN_TEST_MEDIA" ) ;
444485 return ;
445486 } ;
446- let out_dir = dir . join ( format ! ( "future_frame_gap-{}" , std :: process :: id ( ) ) ) ;
447- std :: fs :: create_dir_all ( & out_dir) . expect ( "output dir" ) ;
487+ let outputs = TestOutputDir :: new ( "future-frame-gap" ) ;
488+ let out_dir = & outputs . 0 ;
448489 let gpu = Gpu :: create ( false ) . expect ( "gpu" ) ;
449490 let comp = Compositor :: new_sized ( & gpu, 640 , 360 ) . expect ( "compositor" ) ;
450491 let params = ExportParams {
@@ -503,12 +544,11 @@ fn mp4_export_rejects_a_start_inside_a_multisecond_video_gap() {
503544 "{message}"
504545 ) ;
505546 assert_eq ! ( std:: fs:: read( & out) . unwrap( ) , b"previous export" ) ;
506- assert_eq ! ( std:: fs:: read_dir( & out_dir) . unwrap( ) . count( ) , 1 ) ;
547+ assert_eq ! ( std:: fs:: read_dir( out_dir) . unwrap( ) . count( ) , 1 ) ;
507548 std:: fs:: remove_file ( out) . expect ( "remove destination" ) ;
508549 }
509550 }
510551 }
511- std:: fs:: remove_dir ( out_dir) . expect ( "remove output dir" ) ;
512552}
513553
514554/// A non-zero first video timestamp is a valid stream origin, not an interior gap.
@@ -523,8 +563,8 @@ fn mp4_export_accepts_a_nonzero_first_video_timestamp() {
523563 offset. exists( ) ,
524564 "generate offset_start.mp4 using the fixture header recipe"
525565 ) ;
526- let out_dir = dir . join ( format ! ( "offset_start-{}" , std :: process :: id ( ) ) ) ;
527- std :: fs :: create_dir_all ( & out_dir) . expect ( "output dir" ) ;
566+ let outputs = TestOutputDir :: new ( "offset-start" ) ;
567+ let out_dir = & outputs . 0 ;
528568 let gpu = Gpu :: create ( false ) . expect ( "gpu" ) ;
529569 let comp = Compositor :: new_sized ( & gpu, 640 , 360 ) . expect ( "compositor" ) ;
530570 #[ cfg( target_os = "macos" ) ]
@@ -568,7 +608,6 @@ fn mp4_export_accepts_a_nonzero_first_video_timestamp() {
568608 assert ! ( pipeline:: probe_frame_count( & out. to_string_lossy( ) ) . expect( "decode output" ) > 0 ) ;
569609 std:: fs:: remove_file ( out) . expect ( "remove export" ) ;
570610 }
571- std:: fs:: remove_dir ( out_dir) . expect ( "remove output dir" ) ;
572611}
573612
574613/// The macOS frame probe must count decoded video rather than require MP4
@@ -580,7 +619,8 @@ fn frame_probe_counts_video_without_declared_frame_count() {
580619 eprintln ! ( "skipped: set OPENSCREEN_TEST_MEDIA" ) ;
581620 return ;
582621 } ;
583- let source = dir. join ( format ! ( "frame_probe-{}.mkv" , std:: process:: id( ) ) ) ;
622+ let outputs = TestOutputDir :: new ( "frame-probe" ) ;
623+ let source = outputs. 0 . join ( "video.mkv" ) ;
584624 openscreen_compositor:: remux:: remux_to_seekable_matroska (
585625 & dir. join ( "screen_colors.mp4" ) . to_string_lossy ( ) ,
586626 & source. to_string_lossy ( ) ,
0 commit comments