mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-01 13:01:21 -03:00
test_history_path_detection to adopt custom history directories
Simplifies this test by making it no longer serial.
This commit is contained in:
@@ -1810,7 +1810,6 @@ mod tests {
|
||||
use crate::env::{EnvMode, EnvSetMode, EnvStack};
|
||||
use crate::fs::{LockedFile, WriteMethod};
|
||||
use crate::prelude::*;
|
||||
use crate::tests::prelude::*;
|
||||
use fish_build_helper::workspace_root;
|
||||
use fish_wcstringutil::{string_prefixes_string, string_prefixes_string_case_insensitive};
|
||||
use rand::Rng;
|
||||
@@ -2286,10 +2285,13 @@ fn test_history_merge() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[serial]
|
||||
fn test_history_path_detection() {
|
||||
let _cleanup = test_init();
|
||||
// Regression test for #7582.
|
||||
// Temporary directory for the history files.
|
||||
let hist_tmpdir = fish_tempfile::new_dir().unwrap();
|
||||
let hist_dir = Some(osstr2wcstring(hist_tmpdir.path()));
|
||||
|
||||
// Temporary directory for the files we will detect.
|
||||
let tmpdir = fish_tempfile::new_dir().unwrap();
|
||||
|
||||
// Place one valid file in the directory.
|
||||
@@ -2304,7 +2306,7 @@ fn test_history_path_detection() {
|
||||
test_vars.set_one(L!("PWD"), global_mode, wdir_path.clone());
|
||||
test_vars.set_one(L!("HOME"), global_mode, wdir_path.clone());
|
||||
|
||||
let history = History::with_name(L!("path_detection"));
|
||||
let history = History::new(L!("path_detection"), hist_dir);
|
||||
history.clear();
|
||||
assert_eq!(history.size(), 0);
|
||||
history.add_pending_with_file_detection(
|
||||
|
||||
Reference in New Issue
Block a user