myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix race condition in directory tests (#748)

Browse source
This commit is contained in:
cyqsimon 2023-03-02 17:39:15 +08:00 committed by GitHub
parent e6ff051430
commit a033890506
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
atuin-common/src/utils.rs
View file

@ -50,6 +50,14 @@ mod tests {
use std::env; use std::env;
#[test] #[test]
fn test_dirs() {
// these tests need to be run sequentially to prevent race condition
test_config_dir_xdg();
test_config_dir();
test_data_dir_xdg();
test_data_dir();
}
fn test_config_dir_xdg() { fn test_config_dir_xdg() {
env::remove_var("HOME"); env::remove_var("HOME");
env::set_var("XDG_CONFIG_HOME", "/home/user/custom_config"); env::set_var("XDG_CONFIG_HOME", "/home/user/custom_config");
@ -60,7 +68,6 @@ mod tests {
env::remove_var("XDG_CONFIG_HOME"); env::remove_var("XDG_CONFIG_HOME");
} }
#[test]
fn test_config_dir() { fn test_config_dir() {
env::set_var("HOME", "/home/user"); env::set_var("HOME", "/home/user");
env::remove_var("XDG_CONFIG_HOME"); env::remove_var("XDG_CONFIG_HOME");
@ -68,7 +75,6 @@ mod tests {
env::remove_var("HOME"); env::remove_var("HOME");
} }
#[test]
fn test_data_dir_xdg() { fn test_data_dir_xdg() {
env::remove_var("HOME"); env::remove_var("HOME");
env::set_var("XDG_DATA_HOME", "/home/user/custom_data"); env::set_var("XDG_DATA_HOME", "/home/user/custom_data");
@ -76,7 +82,6 @@ mod tests {
env::remove_var("XDG_DATA_HOME"); env::remove_var("XDG_DATA_HOME");
} }
#[test]
fn test_data_dir() { fn test_data_dir() {
env::set_var("HOME", "/home/user"); env::set_var("HOME", "/home/user");
env::remove_var("XDG_DATA_HOME"); env::remove_var("XDG_DATA_HOME");