mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 23:10:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

tesutils: replace lazy_static with std::sync::Once

Browse source
This commit is contained in:
Benjamin Saunders 2022-10-31 18:29:45 -07:00
parent 62511f7cad
commit de1dc4ca13
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -752,7 +752,6 @@ dependencies = [
"hex",
"insta",
"itertools",
"lazy_static",
"maplit",
"num_cpus",
"once_cell",

1
lib/Cargo.toml
View file

@ -27,7 +27,6 @@ config = { version = "0.13.2", default-features = false, features = ["toml"] }
git2 = "0.15.0"
hex = "0.4.3"
itertools = "0.10.5"
lazy_static = "1.4.0"
maplit = "1.0.2"
once_cell = "1.16.0"
pest = "2.4.0"

26
lib/src/testutils.rs
View file

@ -16,10 +16,9 @@ use std::fs;
use std::fs::OpenOptions;
use std::io::{Read, Write};
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::sync::{Arc, Once};
use itertools::Itertools;
use lazy_static::lazy_static;
use tempfile::TempDir;
use crate::backend::{FileId, TreeId, TreeValue};
@ -36,26 +35,21 @@ use crate::tree::Tree;
use crate::tree_builder::TreeBuilder;
use crate::workspace::Workspace;
lazy_static! {
pub fn hermetic_libgit2() {
// libgit2 respects init.defaultBranch (and possibly other config
// variables) in the user's config files. Disable access to them to make
// our tests hermetic.
//
// set_search_path is unsafe because it cannot guarantee thread safety (as
// its documentation states). For the same reason, we wrap these invocations
// in lazy_static!.
static ref CONFIGURE_GIT2: () = {
unsafe {
git2::opts::set_search_path(git2::ConfigLevel::System, "").unwrap();
git2::opts::set_search_path(git2::ConfigLevel::Global, "").unwrap();
git2::opts::set_search_path(git2::ConfigLevel::XDG, "").unwrap();
git2::opts::set_search_path(git2::ConfigLevel::ProgramData, "").unwrap();
}
};
}
pub fn hermetic_libgit2() {
lazy_static::initialize(&CONFIGURE_GIT2);
// in `call_once`.
static CONFIGURE_GIT2: Once = Once::new();
CONFIGURE_GIT2.call_once(|| unsafe {
git2::opts::set_search_path(git2::ConfigLevel::System, "").unwrap();
git2::opts::set_search_path(git2::ConfigLevel::Global, "").unwrap();
git2::opts::set_search_path(git2::ConfigLevel::XDG, "").unwrap();
git2::opts::set_search_path(git2::ConfigLevel::ProgramData, "").unwrap();
});
}
pub fn new_temp_dir() -> TempDir {