Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ fn main() {
let config = if cli.ignore_config {
Config::with_none()
} else if let Some(path) = &cli.config_file {
Config::from_file(path).expect("Provided file path is invalid")
Config::from_file(path).unwrap_or_else(|| {
print_error!("Can not use config file {}.", path.to_string_lossy());
std::process::exit(ExitCode::MajorIssue as i32);
})
} else {
Config::default()
};
Expand Down
31 changes: 31 additions & 0 deletions tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,37 @@ fn test_custom_config_file_parsing() {
.stdout(predicate::str::is_match("folder\n└── file").unwrap());
}

#[test]
fn test_missing_custom_config_file_fails_without_panic() {
let dir = tempdir();

cmd()
.arg("--config-file")
.arg(dir.path().join("does_not_exist.yaml"))
.arg(dir.path())
.assert()
.failure()
.stderr(predicate::str::starts_with("lsd: "))
.stderr(predicate::str::contains("panicked at").not());
}

#[test]
fn test_malformed_custom_config_file_fails_without_panic() {
let dir = tempdir();
dir.child("config.yaml")
.write_str("display: bogus")
.unwrap();

cmd()
.arg("--config-file")
.arg(dir.path().join("config.yaml"))
.arg(dir.path())
.assert()
.failure()
.stderr(predicate::str::starts_with("lsd: "))
.stderr(predicate::str::contains("panicked at").not());
}

#[test]
fn test_cannot_access_file_exit_status() {
let dir = tempdir();
Expand Down