Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed test modifications, added special case to git initialization for when the repository is inside a .git folder

Browse source
This commit is contained in:
Mikayla Maki 2023-05-08 08:44:41 -07:00
parent f9e4464658
commit 62e763d0d3
No known key found for this signature in database
2 changed files with 54 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/collab/src/tests/randomized_integration_tests.rs
View file

@ -29,7 +29,7 @@ use std::{
sync::{
atomic::{AtomicBool, Ordering::SeqCst},
Arc,
}, ffi::OsStr,
},
};
use util::ResultExt;
@ -765,7 +765,7 @@ async fn apply_client_operation(
contents,
} => {
if !client.fs.directories().contains(&repo_path) {
client.fs.create_dir(&repo_path).await?;
return Err(TestError::Inapplicable);
}
log::info!(
@ -791,7 +791,7 @@ async fn apply_client_operation(
new_branch,
} => {
if !client.fs.directories().contains(&repo_path) {
client.fs.create_dir(&repo_path).await?;
return Err(TestError::Inapplicable);
}
log::info!(
@ -1700,16 +1700,13 @@ impl TestPlan {
let repo_path = client
.fs
.directories()
.into_iter()
.filter(|dir| dir.ends_with(".git"))
.collect::<Vec<_>>()
.choose(&mut self.rng)
.unwrap()
.clone();
let repo_path = if repo_path.file_name() == Some(&OsStr::new(".git")) {
repo_path.parent().unwrap().join(Alphanumeric.sample_string(&mut self.rng, 16))
} else {
repo_path
};
let mut file_paths = client
.fs
.files()
@ -1741,16 +1738,13 @@ impl TestPlan {
let repo_path = client
.fs
.directories()
.into_iter()
.filter(|dir| dir.ends_with(".git"))
.collect::<Vec<_>>()
.choose(&mut self.rng)
.unwrap()
.clone();
let repo_path = if repo_path.file_name() == Some(&OsStr::new(".git")) {
repo_path.parent().unwrap().join(Alphanumeric.sample_string(&mut self.rng, 16))
} else {
repo_path
};
let new_branch = (self.rng.gen_range(0..10) > 3)
.then(|| Alphanumeric.sample_string(&mut self.rng, 8));