better test clean up

This makes it so that you don't need to manually delete a bunch of files on test failure.

Author: Anton-4

ci/expect_scripts/file.exp

@@ -64,12 +64,13 @@ expect "Testing some File functions..." {
                                                                                                                                 expect "✓ File.exists! returns true for a file that exists" {
                                                                                                                                     expect "✓ File.exists! returns false for a file that does not exist" {
 
-                                                                                                                                        # Cleanup phase
-                                                                                                                                        expect "Cleaning up test files..." {
-                                                                                                                                            expect "✓ Deleted all files." {
+                                                                                                                                        expect "I ran all file function tests." {
+
+                                                                                                                                            expect "Cleaning up test files..." {
+                                                                                                                                                expect "✓ Deleted all files." {
+                                                                                                                                                
+                                                                                                                                                    # Final completion message
 
-                                                                                                                                                # Final completion message
-                                                                                                                                                expect "I ran all file function tests." {
                                                                                                                                                     expect eof {
                                                                                                                                                         check_exit_and_segfault
                                                                                                                                                     }

ci/expect_scripts/path-test.exp

@@ -91,24 +91,23 @@ expect "Testing Path functions..." {
                                                                                                                                                                                                                                                                                     expect "✓ Path.exists! returns true for a file that exists" {
                                                                                                                                                                                                                                                                                         expect "✓ Path.exists! returns false for a file that does not exist" {
                                                                                                                                                                                                                                                                                             expect "" {
-                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                # Cleanup phase
-                                                                                                                                                                                                                                                                                                expect "Cleaning up test files..." {
-                                                                                                                                                                                                                                                                                                    expect "Files to clean up:" {
-                                                                                                                                                                                                                                                                                                        expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_bytes\\.txt" {
-                                                                                                                                                                                                                                                                                                            expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_hardlink\\.txt" {
-                                                                                                                                                                                                                                                                                                                expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_json\\.json" {
-                                                                                                                                                                                                                                                                                                                    expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_original\\.txt" {
-                                                                                                                                                                                                                                                                                                                        expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_rename_new\\.txt" {
-                                                                                                                                                                                                                                                                                                                            expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_utf8\\.txt" {
-                                                                                                                                                                                                                                                                                                                                expect "" {
-                                                                                                                                                                                                                                                                                                                                    expect "Files remaining after cleanup: Bool.false" {
+                                                                                                                                                                                                                                                                                                expect "I ran all Path function tests." {
+                                                                                                                                                                                                                                                                                                    expect "" {
+
+                                                                                                                                                                                                                                                                                                        # Cleanup phase
+                                                                                                                                                                                                                                                                                                        expect "Cleaning up test files..." {
+                                                                                                                                                                                                                                                                                                            expect "Files to clean up:" {
+                                                                                                                                                                                                                                                                                                                expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_bytes\\.txt" {
+                                                                                                                                                                                                                                                                                                                    expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_hardlink\\.txt" {
+                                                                                                                                                                                                                                                                                                                        expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_json\\.json" {
+                                                                                                                                                                                                                                                                                                                            expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_original\\.txt" {
+                                                                                                                                                                                                                                                                                                                                expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_rename_new\\.txt" {
+                                                                                                                                                                                                                                                                                                                                    expect -re "-rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_utf8\\.txt" {
                                                                                                                                                                                                                                                                                                                                         expect "" {
-                                                                                                                                                                                                                                                                                                                                            
-                                                                                                                                                                                                                                                                                                                                            # Final completion message
-                                                                                                                                                                                                                                                                                                                                            expect "I ran all Path function tests." {
+                                                                                                                                                                                                                                                                                                                                            expect "Files remaining after cleanup: Bool.false" {        
                                                                                                                                                                                                                                                                                                                                                 expect eof {
-                                                                                                                                                                                                                                                                                                                                                    check_exit_and_segfault
+                                                                                                                                                                                                                                                                                                                                                        check_exit_and_segfault
+                                                                                                                                                                                                                                                                                                                                                    }
                                                                                                                                                                                                                                                                                                                                                 }
                                                                                                                                                                                                                                                                                                                                             }
                                                                                                                                                                                                                                                                                                                                         }
@@ -121,7 +120,6 @@ expect "Testing Path functions..." {
                                                                                                                                                                                                                                                                                                             }
                                                                                                                                                                                                                                                                                                         }
                                                                                                                                                                                                                                                                                                     }
-                                                                                                                                                                                                                                                                                                }
                                                                                                                                                                                                                                                                                             }
                                                                                                                                                                                                                                                                                         }
                                                                                                                                                                                                                                                                                     }

tests/file.roc

@@ -12,6 +12,15 @@ import json.Json
 
 main! : List Arg => Result {} _
 main! = |_args|
+    when run_tests!({}) is
+        Ok(_) ->
+            cleanup_test_files!(FilesNeedToExist)
+        Err(err) ->
+            cleanup_test_files!(FilesMaybeExist)?
+            Err(Exit(1, "Test run failed:\n\t${Inspect.to_str(err)}"))
+
+run_tests! : {} => Result {} _
+run_tests! = |{}|
     Stdout.line!("Testing some File functions...")?
     Stdout.line!("This will create and manipulate test files in the current directory.")?
     Stdout.line!("")?
@@ -34,9 +43,6 @@ main! = |_args|
     # Test file exists
     test_file_exists!({})?
 
-    # Clean up test files
-    cleanup_test_files!({})?
-
     Stdout.line!("\nI ran all file function tests.")
 
 test_basic_file_operations! : {} => Result {} _
@@ -236,8 +242,8 @@ test_file_exists! = |{}|
 
     Ok({})
 
-cleanup_test_files! : {} => Result {} _
-cleanup_test_files! = |{}|
+cleanup_test_files! : [FilesNeedToExist, FilesMaybeExist] => Result {} _
+cleanup_test_files! = |files_requirement|
     Stdout.line!("\nCleaning up test files...")?
     
     test_files = [
@@ -250,5 +256,17 @@ cleanup_test_files! = |{}|
         "test_rename_new.txt",
     ]
 
-    List.for_each_try!(test_files, |filename| File.delete!(filename)) ? |err| FileDeletionFailed(err) 
+    delete_result = List.for_each_try!(
+        test_files,
+        |filename| File.delete!(filename)
+    )
+    
+    when files_requirement is
+        FilesNeedToExist ->
+            delete_result ? |err| FileDeletionFailed(err)
+            
+        FilesMaybeExist ->
+            Ok({})?
+
     Stdout.line!("✓ Deleted all files.")
+