chore(ci): fix some flaky tests (#5900)

foundry-rs · Sep 27, 2023 · 5bb886f · 5bb886f
1 parent dfa3e4c
commit 5bb886f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/crates/chisel/src/executor.rs b/crates/chisel/src/executor.rs
@@ -1636,7 +1636,7 @@ mod tests {
 
         // on some CI targets installing results in weird malformed solc files, we try installing it
         // multiple times
-        let version = "0.8.19";
+        let version = "0.8.20";
         for _ in 0..3 {
             let mut is_preinstalled = PRE_INSTALL_SOLC_LOCK.lock().unwrap();
             if !*is_preinstalled {

diff --git a/testdata/cheats/Fs.t.sol b/testdata/cheats/Fs.t.sol
@@ -303,7 +303,10 @@ contract FsTest is DSTest {
         metadata = vm.fsMetadata("fixtures/File/read.txt");
         assertEq(metadata.isDir, false);
         assertEq(metadata.isSymlink, false);
-        assertEq(metadata.length, 45);
+        // This test will fail on windows if we compared to 45, as windows
+        // ends files with both line feed and carriage return, unlike
+        // unix which only uses the first one.
+        assertTrue(metadata.length == 45 || metadata.length == 46);
 
         metadata = vm.fsMetadata("fixtures/File/symlink");
         assertEq(metadata.isDir, false);