Skip to content

test: fix some tests #5839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2023
Merged

test: fix some tests #5839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50e6288
test: fix some tests
DaniPopes Sep 15, 2023
5eaa98d
fix tests
DaniPopes Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/chisel/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1630,7 +1630,7 @@ mod tests {
}
Err(e) => {
// try reinstalling
eprintln!("error: {e}\n trying to re-install Solc v{version}");
eprintln!("error while trying to re-install Solc v{version}: {e}");
let solc = Solc::blocking_install(&version.parse().unwrap());
if solc.map_err(SolcError::from).and_then(|solc| solc.version()).is_ok() {
*is_preinstalled = true;
Expand Down
3 changes: 2 additions & 1 deletion crates/chisel/src/session_source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ impl SessionSource {
/// A new instance of [SessionSource]
#[track_caller]
pub fn new(solc: Solc, config: SessionSourceConfig) -> Self {
debug_assert!(solc.version().is_ok(), "{:?}", solc.version());
#[cfg(debug_assertions)]
let _ = solc.version().unwrap();

Self {
file_name: PathBuf::from("ReplContract.sol".to_string()),
Expand Down
17 changes: 9 additions & 8 deletions testdata/cheats/Fs.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,24 +290,25 @@ contract FsTest is DSTest {
function testFsMetadata() public {
fsProxy = new FsProxy();

string memory path = "fixtures/File";
Vm.FsMetadata memory metadata = vm.fsMetadata(path);
Vm.FsMetadata memory metadata = vm.fsMetadata("fixtures/File");
assertEq(metadata.isDir, true);
assertEq(metadata.isSymlink, false);
assertEq(metadata.readOnly, false);
assertGt(metadata.length, 0);
// These fields aren't available on all platforms, default to zero
// assertGt(metadata.length, 0);
// assertGt(metadata.modified, 0);
// assertGt(metadata.accessed, 0);
// assertGt(metadata.created, 0);

path = "fixtures/File/read.txt";
metadata = vm.fsMetadata(path);
metadata = vm.fsMetadata("fixtures/File/read.txt");
assertEq(metadata.isDir, false);

path = "fixtures/File/symlink";
metadata = vm.fsMetadata(path);
assertEq(metadata.isSymlink, false);
assertEq(metadata.length, 45);

metadata = vm.fsMetadata("fixtures/File/symlink");
assertEq(metadata.isDir, false);
// TODO: symlinks are canonicalized away in `ensure_path_allowed`
// assertEq(metadata.isSymlink, true);

vm.expectRevert();
fsProxy.fsMetadata("../not-found");
Expand Down
2 changes: 0 additions & 2 deletions testdata/fixtures/File/symlink
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions testdata/fixtures/File/symlink
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
read.txt