Skip to content

Commit ecf9a10

Browse files
authored
test: fix some tests (foundry-rs#5839)
* test: fix some tests * fix tests
1 parent ae89c92 commit ecf9a10

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

crates/chisel/src/executor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,7 @@ mod tests {
16301630
}
16311631
Err(e) => {
16321632
// try reinstalling
1633-
eprintln!("error: {e}\n trying to re-install Solc v{version}");
1633+
eprintln!("error while trying to re-install Solc v{version}: {e}");
16341634
let solc = Solc::blocking_install(&version.parse().unwrap());
16351635
if solc.map_err(SolcError::from).and_then(|solc| solc.version()).is_ok() {
16361636
*is_preinstalled = true;

crates/chisel/src/session_source.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ impl SessionSource {
185185
/// A new instance of [SessionSource]
186186
#[track_caller]
187187
pub fn new(solc: Solc, config: SessionSourceConfig) -> Self {
188-
debug_assert!(solc.version().is_ok(), "{:?}", solc.version());
188+
#[cfg(debug_assertions)]
189+
let _ = solc.version().unwrap();
189190

190191
Self {
191192
file_name: PathBuf::from("ReplContract.sol".to_string()),

testdata/cheats/Fs.t.sol

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,24 +290,25 @@ contract FsTest is DSTest {
290290
function testFsMetadata() public {
291291
fsProxy = new FsProxy();
292292

293-
string memory path = "fixtures/File";
294-
Vm.FsMetadata memory metadata = vm.fsMetadata(path);
293+
Vm.FsMetadata memory metadata = vm.fsMetadata("fixtures/File");
295294
assertEq(metadata.isDir, true);
296295
assertEq(metadata.isSymlink, false);
297296
assertEq(metadata.readOnly, false);
298-
assertGt(metadata.length, 0);
299297
// These fields aren't available on all platforms, default to zero
298+
// assertGt(metadata.length, 0);
300299
// assertGt(metadata.modified, 0);
301300
// assertGt(metadata.accessed, 0);
302301
// assertGt(metadata.created, 0);
303302

304-
path = "fixtures/File/read.txt";
305-
metadata = vm.fsMetadata(path);
303+
metadata = vm.fsMetadata("fixtures/File/read.txt");
306304
assertEq(metadata.isDir, false);
307-
308-
path = "fixtures/File/symlink";
309-
metadata = vm.fsMetadata(path);
310305
assertEq(metadata.isSymlink, false);
306+
assertEq(metadata.length, 45);
307+
308+
metadata = vm.fsMetadata("fixtures/File/symlink");
309+
assertEq(metadata.isDir, false);
310+
// TODO: symlinks are canonicalized away in `ensure_path_allowed`
311+
// assertEq(metadata.isSymlink, true);
311312

312313
vm.expectRevert();
313314
fsProxy.fsMetadata("../not-found");

testdata/fixtures/File/symlink

Lines changed: 0 additions & 2 deletions
This file was deleted.

testdata/fixtures/File/symlink

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
read.txt

0 commit comments

Comments
 (0)