facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 06:18:07 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: add FacebookInit to TestRepoFactory

Browse Source 
Summary: Segmented Changelog requires `CoreContext` for construction, so we can create a test mock if `TestRepoFactory` has a `FacebookInit`.

Reviewed By: markbt, mitrandir77

Differential Revision: D35251021

fbshipit-source-id: 57051e227804669794f19fc2ca130f52cb938b0c
This commit is contained in:
Ilia Medianikov 2022-04-13 02:45:23 -07:00 committed by Facebook GitHub Bot
parent f9d335c826
commit e387b2619c
62 changed files with 236 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/mononoke/benchmarks/derived_data/benchmark_large_directory.rs
View File

@ -166,7 +166,7 @@ async fn main(fb: FacebookInit) -> Result<()> {
let data = args.next().unwrap_or_else(|| String::from("fsnodes"));
println!("Deriving: {}", data);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let (mut csid, mut filenames) = make_initial_large_directory(&ctx, &repo, 100_000).await?;

28
eden/mononoke/blobrepo/test/main.rs
View File

@ -66,7 +66,7 @@ async fn get_content(
#[fbinit::test]
async fn upload_blob_no_parents(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let expected_hash = HgFileNodeId::new(string_to_nodehash(
"c3127cdbf2eae0f09653f9237d85c8436425b246",
));
@ -92,7 +92,7 @@ async fn upload_blob_no_parents(fb: FacebookInit) {
#[fbinit::test]
async fn upload_blob_one_parent(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let expected_hash = HgFileNodeId::new(string_to_nodehash(
"c2d60b35a8e7e034042a9467783bbdac88a0d219",
));
@ -120,7 +120,7 @@ async fn upload_blob_one_parent(fb: FacebookInit) {
#[fbinit::test]
async fn create_one_changeset(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let fake_file_path = RepoPath::file("dir/file").expect("Can't generate fake RepoPath");
let fake_dir_path = RepoPath::dir("dir").expect("Can't generate fake RepoPath");
let path = RepoPath::file("dir/file")
@ -176,7 +176,7 @@ async fn create_one_changeset(fb: FacebookInit) {
#[fbinit::test]
async fn create_two_changesets(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let fake_file_path = RepoPath::file("dir/file").expect("Can't generate fake RepoPath");
let fake_dir_path = RepoPath::dir("dir").expect("Can't generate fake RepoPath");
let utf_author: String = "\u{041F}\u{0451}\u{0442}\u{0440} <peter@fb.com>".into();
@ -252,7 +252,7 @@ async fn create_two_changesets(fb: FacebookInit) {
#[fbinit::test]
async fn check_bonsai_creation(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let fake_file_path = RepoPath::file("dir/file").expect("Can't generate fake RepoPath");
let fake_dir_path = RepoPath::dir("dir").expect("Can't generate fake RepoPath");
@ -305,7 +305,7 @@ async fn check_bonsai_creation(fb: FacebookInit) {
#[fbinit::test]
async fn check_bonsai_creation_with_rename(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let parent = {
let fake_file_path = RepoPath::file("file").expect("Can't generate fake RepoPath");
@ -393,7 +393,7 @@ async fn check_bonsai_creation_with_rename(fb: FacebookInit) {
#[fbinit::test]
async fn create_bad_changeset(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let dirhash = string_to_nodehash("c2d60b35a8e7e034042a9467783bbdac88a0d219");
let (_, root_manifest_future) = upload_manifest_no_parents(
@ -415,7 +415,7 @@ async fn create_bad_changeset(fb: FacebookInit) {
#[fbinit::test]
async fn upload_entries_finalize_success(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let fake_file_path = RepoPath::file("file").expect("Can't generate fake RepoPath");
@ -453,7 +453,7 @@ async fn upload_entries_finalize_success(fb: FacebookInit) {
#[fbinit::test]
async fn upload_entries_finalize_fail(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let entries = UploadEntries::new(
repo.get_blobstore(),
@ -901,7 +901,7 @@ async fn test_hg_commit_generation_many_diamond(fb: FacebookInit) {
#[fbinit::test]
async fn test_hg_commit_generation_uneven_branch(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let root_bcs = fixtures::create_bonsai_changeset(vec![]);
@ -987,7 +987,7 @@ async fn test_filenode_lookup(fb: FacebookInit) -> Result<(), Error> {
let memblob = Memblob::default();
let blobstore = Arc::new(TracingBlobstore::new(memblob));
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_blobstore(blobstore.clone())
.build()?;
@ -1089,7 +1089,7 @@ async fn test_filenode_lookup(fb: FacebookInit) -> Result<(), Error> {
async fn test_content_uploaded_filenode_id(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let p1 = None;
let p2 = None;
@ -1135,7 +1135,7 @@ struct TestHelper {
impl TestHelper {
fn new(fb: FacebookInit) -> Result<Self, Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
Ok(Self { ctx, repo })
}
@ -1221,7 +1221,7 @@ mod octopus_merges {
#[fbinit::test]
async fn test_basic(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().expect("Couldn't create repo");
let repo: BlobRepo = test_repo_factory::build_empty(fb).expect("Couldn't create repo");
let p1 = CreateCommitContext::new_root(&ctx, &repo)
.add_file("foo", "foo")

2
eden/mononoke/bonsai_git_mapping/git_mapping_pushrebase_hook/test.rs
View File

@ -28,7 +28,7 @@ fn pushrebase_populates_git_mapping(fb: FacebookInit) -> Result<(), Error> {
async fn pushrebase_populates_git_mapping_impl(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_id(RepositoryId::new(1))
.build()?;
borrowed!(ctx, repo);

4
eden/mononoke/bonsai_globalrev_mapping/globalrev_pushrebase_hook/test.rs
View File

@ -39,7 +39,7 @@ fn pushrebase_assigns_globalrevs(fb: FacebookInit) -> Result<(), Error> {
async fn pushrebase_assigns_globalrevs_impl(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_id(RepositoryId::new(1))
.build()?;
let mapping = repo.bonsai_globalrev_mapping().clone();
@ -191,7 +191,7 @@ async fn pushrebase_race_assigns_monotonic_globalrevs(fb: FacebookInit) -> Resul
}
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_id(RepositoryId::new(1))
.build()?;
let mapping = repo.bonsai_globalrev_mapping().clone();

4
eden/mononoke/bookmarks/bookmarks_movement/src/affected_changesets.rs
View File

@ -636,7 +636,7 @@ mod test {
#[fbinit::test]
async fn test_find_draft_ancestors_simple(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: InnerRepo = test_repo_factory::build_empty()?;
let repo: InnerRepo = test_repo_factory::build_empty(fb)?;
let mapping = create_from_dag(
&ctx,
repo.as_blob_repo(),
@ -690,7 +690,7 @@ mod test {
#[fbinit::test]
async fn test_find_draft_ancestors_merge(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: InnerRepo = test_repo_factory::build_empty()?;
let repo: InnerRepo = test_repo_factory::build_empty(fb)?;
let mapping = create_from_dag(
&ctx,
repo.as_blob_repo(),

2
eden/mononoke/bookmarks/bookmarks_movement/src/git_mapping.rs
View File

@ -282,7 +282,7 @@ mod tests {
#[fbinit::test]
async fn test_new_mapping_entries(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: InnerRepo = TestRepoFactory::new()?.build()?;
let repo: InnerRepo = TestRepoFactory::new(fb)?.build()?;
let bookmark = BookmarkName::new("main")?;
borrowed!(ctx, repo);

6
eden/mononoke/bookmarks/warm_bookmarks_cache/lib.rs
View File

@ -1053,7 +1053,9 @@ mod tests {
put_distr,
get_distr,
));
let repo: InnerRepo = TestRepoFactory::new()?.with_blobstore(blobstore).build()?;
let repo: InnerRepo = TestRepoFactory::new(fb)?
.with_blobstore(blobstore)
.build()?;
Linear::initrepo(fb, &repo.blob_repo).await;
let ctx = CoreContext::test_mock(fb);
@ -1648,7 +1650,7 @@ mod tests {
#[fbinit::test]
async fn test_single_bookmarks_no_history(fb: FacebookInit) -> Result<(), Error> {
let factory = TestRepoFactory::new()?;
let factory = TestRepoFactory::new(fb)?;
let repo: InnerRepo = factory.build()?;
Linear::initrepo(fb, &repo.blob_repo).await;
let ctx = CoreContext::test_mock(fb);

8
eden/mononoke/cmds/hyper_repo_builder/src/add_source_repo.rs
View File

@ -244,7 +244,7 @@ mod tests {
#[fbinit::test]
async fn add_source_repo_simple(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut test_repo_factory = TestRepoFactory::new()?;
let mut test_repo_factory = TestRepoFactory::new(fb)?;
let source_repo: BlobRepo = test_repo_factory
.with_id(RepositoryId::new(0))
@ -340,7 +340,7 @@ mod tests {
#[fbinit::test]
async fn add_source_repo_should_fail_file_intersections(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut test_repo_factory = TestRepoFactory::new()?;
let mut test_repo_factory = TestRepoFactory::new(fb)?;
let source_repo: BlobRepo = test_repo_factory
.with_id(RepositoryId::new(0))
@ -389,7 +389,7 @@ mod tests {
#[fbinit::test]
async fn add_source_repo_simple_with_limit(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut test_repo_factory = TestRepoFactory::new()?;
let mut test_repo_factory = TestRepoFactory::new(fb)?;
let source_repo: BlobRepo = test_repo_factory
.with_id(RepositoryId::new(0))
@ -443,7 +443,7 @@ mod tests {
#[fbinit::test]
async fn add_source_repo_empty_wc(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut test_repo_factory = TestRepoFactory::new()?;
let mut test_repo_factory = TestRepoFactory::new(fb)?;
let source_repo: BlobRepo = test_repo_factory
.with_id(RepositoryId::new(0))

4
eden/mononoke/cmds/hyper_repo_builder/src/tail.rs
View File

@ -288,7 +288,7 @@ mod test {
#[fbinit::test]
async fn test_sync_commit(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut test_repo_factory = TestRepoFactory::new()?;
let mut test_repo_factory = TestRepoFactory::new(fb)?;
let source_repo: InnerRepo = test_repo_factory
.with_id(RepositoryId::new(0))
@ -352,7 +352,7 @@ mod test {
#[fbinit::test]
async fn test_tail_once_simple(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut test_repo_factory = TestRepoFactory::new()?;
let mut test_repo_factory = TestRepoFactory::new(fb)?;
let source_repo: InnerRepo = test_repo_factory
.with_id(RepositoryId::new(0))

6
eden/mononoke/commit_rewriting/backsyncer/src/tests.rs
View File

@ -629,7 +629,7 @@ async fn backsync_unrelated_branch(fb: FacebookInit) -> Result<(), Error> {
async fn backsync_change_mapping(fb: FacebookInit) -> Result<(), Error> {
// Initialize source and target repos
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let source_repo_id = RepositoryId::new(1);
let source_repo: BlobRepo = factory.with_id(source_repo_id).build()?;
let target_repo_id = RepositoryId::new(2);
@ -1208,7 +1208,7 @@ async fn init_repos(
bookmark_renamer_type: BookmarkRenamerType,
) -> Result<(CommitSyncer<SqlSyncedCommitMapping>, TargetRepoDbs), Error> {
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let source_repo_id = RepositoryId::new(1);
let source_repo: BlobRepo = factory.with_id(source_repo_id).build()?;
Linear::initrepo(fb, &source_repo).await;
@ -1493,7 +1493,7 @@ async fn init_merged_repos(
> {
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let large_repo_id = RepositoryId::new(num_repos as i32);
let large_repo: BlobRepo = factory.with_id(large_repo_id).build()?;

8
eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_sync_outcome.rs
View File

@ -770,7 +770,7 @@ mod tests {
#[fbinit::test]
async fn test_ancestor_hint_selector(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blob_repo: BlobRepo = TestRepoFactory::new()?.with_id(LARGE_REPO_ID).build()?;
let blob_repo: BlobRepo = TestRepoFactory::new(fb)?.with_id(LARGE_REPO_ID).build()?;
let lca_hint: Target<Arc<dyn LeastCommonAncestorsHint>> =
Target(Arc::new(SkiplistIndex::new()));
let dag = create_from_dag(
@ -853,7 +853,7 @@ mod tests {
#[fbinit::test]
async fn test_descendant_hint_selector(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blob_repo: BlobRepo = test_repo_factory::build_empty()?;
let blob_repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let lca_hint: Target<Arc<dyn LeastCommonAncestorsHint>> =
Target(Arc::new(SkiplistIndex::new()));
let dag = create_from_dag(
@ -983,7 +983,7 @@ mod tests {
#[fbinit::test]
async fn test_bookmark_hint_selector(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blob_repo: BlobRepo = TestRepoFactory::new()?.with_id(LARGE_REPO_ID).build()?;
let blob_repo: BlobRepo = TestRepoFactory::new(fb)?.with_id(LARGE_REPO_ID).build()?;
let lca_hint: Target<Arc<dyn LeastCommonAncestorsHint>> =
Target(Arc::new(SkiplistIndex::new()));
let dag = create_from_dag(
@ -1049,7 +1049,7 @@ mod tests {
#[fbinit::test]
async fn test_only_hint(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blob_repo: BlobRepo = TestRepoFactory::new()?.with_id(LARGE_REPO_ID).build()?;
let blob_repo: BlobRepo = TestRepoFactory::new(fb)?.with_id(LARGE_REPO_ID).build()?;
let dag = create_from_dag(
&ctx,
&blob_repo,

10
eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs
View File

@ -896,14 +896,14 @@ mod test {
#[fbinit::test]
async fn test_verify_working_copy(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let source = test_repo_factory::build_empty()?;
let source = test_repo_factory::build_empty(fb)?;
let source_cs_id = CreateCommitContext::new_root(&ctx, &source)
.add_file("prefix/file1", "1")
.add_file("prefix/file2", "2")
.commit()
.await?;
let target = test_repo_factory::build_empty()?;
let target = test_repo_factory::build_empty(fb)?;
let target_cs_id = CreateCommitContext::new_root(&ctx, &target)
.add_file("file1", "1")
.commit()
@ -932,7 +932,7 @@ mod test {
#[fbinit::test]
async fn test_verify_working_copy_with_prefixes(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let source: BlobRepo = test_repo_factory::build_empty()?;
let source: BlobRepo = test_repo_factory::build_empty(fb)?;
let source_cs_id = CreateCommitContext::new_root(&ctx, &source)
.add_file("prefix/sub/file1", "1")
.add_file("prefix/sub/file2", "2")
@ -940,7 +940,7 @@ mod test {
.commit()
.await?;
let target: BlobRepo = test_repo_factory::build_empty()?;
let target: BlobRepo = test_repo_factory::build_empty(fb)?;
let target_cs_id = CreateCommitContext::new_root(&ctx, &target)
.add_file("sub/file1", "1")
.add_file("sub/file2", "2")
@ -986,7 +986,7 @@ mod test {
#[fbinit::test]
async fn test_verify_working_copy_fast_path(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let source = factory.with_id(RepositoryId::new(0)).build()?;
let root_source_cs_id = CreateCommitContext::new_root(&ctx, &source)
.add_file("prefix/sub/file1", "1")

32
eden/mononoke/commit_rewriting/cross_repo_sync/test/main.rs
View File

@ -375,7 +375,7 @@ fn create_large_to_small_commit_syncer(
#[fbinit::test]
async fn test_sync_parentage(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping()?;
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb)?;
Linear::initrepo(fb, &small_repo).await;
let config =
create_small_to_large_commit_syncer(&ctx, small_repo, megarepo.clone(), "linear", mapping)?;
@ -517,7 +517,7 @@ async fn update_master_file(ctx: CoreContext, repo: &BlobRepo) -> ChangesetId {
#[fbinit::test]
async fn test_sync_causes_conflict(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let megarepo: BlobRepo = TestRepoFactory::new()?
let megarepo: BlobRepo = TestRepoFactory::new(fb)?
.with_id(RepositoryId::new(1))
.build()?;
@ -569,11 +569,13 @@ async fn test_sync_causes_conflict(fb: FacebookInit) -> Result<(), Error> {
Ok(())
}
fn prepare_repos_and_mapping() -> Result<(BlobRepo, BlobRepo, SqlSyncedCommitMapping), Error> {
fn prepare_repos_and_mapping(
fb: FacebookInit,
) -> Result<(BlobRepo, BlobRepo, SqlSyncedCommitMapping), Error> {
let metadata_con = SqliteConnection::open_in_memory()?;
metadata_con.execute_batch(SqlSyncedCommitMapping::CREATION_QUERY)?;
let hg_mutation_con = SqliteConnection::open_in_memory()?;
let mut factory = TestRepoFactory::with_sqlite_connection(metadata_con, hg_mutation_con)?;
let mut factory = TestRepoFactory::with_sqlite_connection(fb, metadata_con, hg_mutation_con)?;
let megarepo = factory.with_id(RepositoryId::new(1)).build()?;
let small_repo = factory.with_id(RepositoryId::new(0)).build()?;
let mapping =
@ -584,7 +586,7 @@ fn prepare_repos_and_mapping() -> Result<(BlobRepo, BlobRepo, SqlSyncedCommitMap
#[fbinit::test]
async fn test_sync_empty_commit(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping()?;
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb)?;
Linear::initrepo(fb, &small_repo).await;
let linear = small_repo;
@ -689,7 +691,7 @@ async fn megarepo_copy_file(
#[fbinit::test]
async fn test_sync_copyinfo(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping().unwrap();
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb).unwrap();
Linear::initrepo(fb, &small_repo).await;
let linear = small_repo;
@ -770,7 +772,7 @@ async fn test_sync_copyinfo(fb: FacebookInit) -> Result<(), Error> {
#[fbinit::test]
async fn test_sync_implicit_deletes(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping().unwrap();
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb).unwrap();
ManyFilesDirs::initrepo(fb, &small_repo).await;
let repo = small_repo.clone();
@ -940,7 +942,7 @@ async fn update_linear_1_file(ctx: CoreContext, repo: &BlobRepo) -> ChangesetId
#[fbinit::test]
async fn test_sync_parent_search(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping()?;
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb)?;
Linear::initrepo(fb, &small_repo).await;
let linear = small_repo;
@ -1060,7 +1062,7 @@ async fn get_multiple_master_mapping_setup(
Error,
> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping().unwrap();
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb).unwrap();
Linear::initrepo(fb, &small_repo).await;
let small_to_large_syncer = create_small_to_large_commit_syncer(
&ctx,
@ -1596,7 +1598,7 @@ async fn test_disabled_sync(fb: FacebookInit) -> Result<(), Error> {
#[fbinit::test]
async fn test_disabled_sync_pushrebase(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping().unwrap();
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb).unwrap();
Linear::initrepo(fb, &small_repo).await;
let small_to_large_syncer = create_small_to_large_commit_syncer(
&ctx,
@ -1698,7 +1700,7 @@ async fn prepare_commit_syncer_with_mapping_change(
Error,
> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping()?;
let (small_repo, megarepo, mapping) = prepare_repos_and_mapping(fb)?;
let (large_to_small_syncer, config_source) =
create_large_to_small_commit_syncer_and_config_source(
&ctx,
@ -1887,7 +1889,7 @@ async fn merge_test_setup(
> {
let ctx = CoreContext::test_mock(fb);
// Set up various structures
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let large_repo: BlobRepo = factory.with_id(RepositoryId::new(0)).build()?;
let small_repo: BlobRepo = factory.with_id(RepositoryId::new(1)).build()?;
let mapping = SqlSyncedCommitMapping::with_sqlite_in_memory()?;
@ -2209,7 +2211,7 @@ async fn test_no_accidental_preserved_roots(
#[fbinit::test]
async fn test_no_accidental_preserved_roots_large_to_small(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, large_repo, mapping) = prepare_repos_and_mapping().unwrap();
let (small_repo, large_repo, mapping) = prepare_repos_and_mapping(fb).unwrap();
let commit_sync_repos = CommitSyncRepos::LargeToSmall {
small_repo: small_repo.clone(),
large_repo: large_repo.clone(),
@ -2220,7 +2222,7 @@ async fn test_no_accidental_preserved_roots_large_to_small(fb: FacebookInit) ->
#[fbinit::test]
async fn test_no_accidental_preserved_roots_small_to_large(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let (small_repo, large_repo, mapping) = prepare_repos_and_mapping().unwrap();
let (small_repo, large_repo, mapping) = prepare_repos_and_mapping(fb).unwrap();
let commit_sync_repos = CommitSyncRepos::SmallToLarge {
small_repo: small_repo.clone(),
large_repo: large_repo.clone(),
@ -2233,7 +2235,7 @@ async fn test_not_sync_candidate_if_mapping_does_not_have_small_repo(
fb: FacebookInit,
) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let mapping =
SqlSyncedCommitMapping::from_sql_connections(factory.metadata_db().clone().into());

2
eden/mononoke/commit_rewriting/cross_repo_sync/test_utils/lib.rs
View File

@ -133,7 +133,7 @@ pub async fn init_small_large_repo(
),
Error,
> {
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(ctx.fb)?;
let megarepo: BlobRepo = factory.with_id(RepositoryId::new(1)).build()?;
let mapping =
SqlSyncedCommitMapping::from_sql_connections(factory.metadata_db().clone().into());

4
eden/mononoke/commit_rewriting/megarepo/tool/catchup.rs
View File

@ -255,7 +255,7 @@ mod test {
async fn test_find_changed_files_with_revert(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root_commit = CreateCommitContext::new_root(&ctx, &repo)
.add_file("file", "a")
@ -358,7 +358,7 @@ mod test {
}
async fn prepare_repo(ctx: &CoreContext) -> Result<BlobRepo, Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(ctx.fb)?;
let root_commit = CreateCommitContext::new_root(ctx, &repo)
.add_file("unchanged/a", "a")

2
eden/mononoke/commit_rewriting/megarepo/tool/gradual_merge.rs
View File

@ -569,7 +569,7 @@ mod test {
async fn create_repo(
ctx: &CoreContext,
) -> Result<(InnerRepo, ChangesetId, Vec<ChangesetId>), Error> {
let repo: InnerRepo = test_repo_factory::build_empty()?;
let repo: InnerRepo = test_repo_factory::build_empty(ctx.fb)?;
let dag = create_from_dag(
&ctx,

24
eden/mononoke/common/copy_utils/src/lib.rs
View File

@ -333,7 +333,7 @@ mod test {
#[fbinit::test]
async fn test_list_directory(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir/a", "a")
.add_file("dir/b", "b")
@ -354,7 +354,7 @@ mod test {
#[fbinit::test]
async fn test_rsync_simple(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from/a", "a")
.add_file("dir_from/b", "b")
@ -398,7 +398,7 @@ mod test {
#[fbinit::test]
async fn test_rsync_multiple(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from_1/a", "a")
.add_file("dir_from_1/b", "b")
@ -455,7 +455,7 @@ mod test {
#[fbinit::test]
async fn test_rsync_with_limit(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from/a", "a")
.add_file("dir_from/b", "b")
@ -533,7 +533,7 @@ mod test {
#[fbinit::test]
async fn test_rsync_with_excludes(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from/BUCK", "buck")
.add_file("dir_from/b", "b")
@ -584,7 +584,7 @@ mod test {
#[fbinit::test]
async fn test_rsync_with_file_size_limit(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from/a", "aaaaaaaaaa")
.add_file("dir_from/b", "b")
@ -666,7 +666,7 @@ mod test {
fb: FacebookInit,
) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from/a", "aaaaaaaaaa")
.add_file("dir_from/b", "b")
@ -713,7 +713,7 @@ mod test {
#[fbinit::test]
async fn test_rsync_with_overwrite(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from/a", "aa")
.add_file("dir_from/b", "b")
@ -803,7 +803,7 @@ mod test {
#[fbinit::test]
async fn test_delete_excessive_files(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from/a", "a")
.add_file("dir_to/a", "a")
@ -839,7 +839,7 @@ mod test {
#[fbinit::test]
async fn test_delete_excessive_files_multiple_dirs(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir_from_1/a", "a")
.add_file("dir_to_1/a", "a")
@ -883,7 +883,7 @@ mod test {
#[fbinit::test]
async fn test_delete_excessive_files_xrepo(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let source_repo = factory.with_id(RepositoryId::new(0)).build()?;
let target_repo = factory.with_id(RepositoryId::new(1)).build()?;
@ -925,7 +925,7 @@ mod test {
#[fbinit::test]
async fn test_xrepo_rsync_with_overwrite(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let source_repo = factory.with_id(RepositoryId::new(0)).build()?;
let target_repo = factory.with_id(RepositoryId::new(1)).build()?;

8
eden/mononoke/derived_data/blame/tests.rs
View File

@ -150,7 +150,7 @@ async fn test_blame_version(fb: FacebookInit, version: BlameVersion) -> Result<(
// 4
//
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_config_override(|config| {
config
.derived_data_config
@ -260,7 +260,7 @@ async fn test_blame_size_rejected_version(
version: BlameVersion,
) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
borrowed!(ctx, repo);
let file1 = "file1";
let content = "content";
@ -274,7 +274,7 @@ async fn test_blame_size_rejected_version(
let (blame, _) = fetch_blame_compat(ctx, repo, c1, MPath::new(file1)?).await?;
let _ = blame.ranges()?;
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_config_override(|config| {
config
.derived_data_config
@ -311,7 +311,7 @@ async fn test_blame_size_rejected_version(
#[fbinit::test]
async fn test_blame_copy_source(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_config_override(|config| {
config
.derived_data_config

8
eden/mononoke/derived_data/deleted_files_manifest/test_utils.rs
View File

@ -67,7 +67,7 @@ pub(crate) use impl_deleted_manifest_tests;
pub(crate) async fn linear_test<Root: RootDeletedManifestIdCommon>(fb: FacebookInit) {
// Test simple separate files and whole dir deletions
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
// create parent deleted files manifest
@ -334,7 +334,7 @@ pub(crate) async fn merged_history_test<Root: RootDeletedManifestIdCommon>(
// | /
// A
//
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let a = CreateCommitContext::new_root(&ctx, &repo)
@ -542,7 +542,7 @@ pub(crate) async fn merged_history_test<Root: RootDeletedManifestIdCommon>(
pub(crate) async fn test_find_entries<Root: RootDeletedManifestIdCommon>(fb: FacebookInit) {
// Test simple separate files and whole dir deletions
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
// create parent deleted files manifest
@ -656,7 +656,7 @@ pub(crate) async fn test_find_entries<Root: RootDeletedManifestIdCommon>(fb: Fac
pub(crate) async fn test_list_all_entries<Root: RootDeletedManifestIdCommon>(fb: FacebookInit) {
// Test simple separate files and whole dir deletions
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
// create parent deleted files manifest

1
eden/mononoke/derived_data/derived_generation/Cargo.toml
View File

@ -18,6 +18,7 @@ bytes = { version = "1.1", features = ["serde"] }
context = { version = "0.1.0", path = "../../server/context" }
derived_data_manager = { version = "0.1.0", path = "../manager" }
derived_data_service_if = { version = "0.1.0", path = "../remote/if" }
fbinit = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
test_repo_factory = { version = "0.1.0", path = "../../repo_factory/test_repo_factory" }
tokio = { version = "1.15", features = ["full", "test-util", "tracing"] }

22
eden/mononoke/derived_data/fastlog/ops.rs
View File

@ -878,7 +878,7 @@ mod test {
#[fbinit::test]
async fn test_list_linear_history(fb: FacebookInit) -> Result<(), Error> {
// generate couple of hundreds linear file changes and list history
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -950,7 +950,7 @@ mod test {
// A
//
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1021,7 +1021,7 @@ mod test {
// o
//
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1080,7 +1080,7 @@ mod test {
// | |
// o o
//
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1170,7 +1170,7 @@ mod test {
#[fbinit::test]
async fn test_list_history_deleted(fb: FacebookInit) -> Result<(), Error> {
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1263,7 +1263,7 @@ mod test {
// |
// A
//
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1391,7 +1391,7 @@ mod test {
#[fbinit::test]
async fn test_list_history_across_deletions_linear(fb: FacebookInit) -> Result<(), Error> {
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1445,7 +1445,7 @@ mod test {
#[fbinit::test]
async fn test_list_history_across_deletions_with_merges(fb: FacebookInit) -> Result<(), Error> {
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1525,7 +1525,7 @@ mod test {
#[fbinit::test]
async fn test_list_history_with_mutable_renames(fb: FacebookInit) -> Result<(), Error> {
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1687,7 +1687,7 @@ mod test {
#[fbinit::test]
async fn test_different_order(fb: FacebookInit) -> Result<(), Error> {
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);
@ -1778,7 +1778,7 @@ mod test {
#[fbinit::test]
async fn test_simple_gen_num(fb: FacebookInit) -> Result<(), Error> {
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty().unwrap();
let repo: TestRepoWithMutableRenames = test_repo_factory::build_empty(fb).unwrap();
let mutable_renames = repo.mutable_renames;
let repo = repo.blob_repo;
let ctx = CoreContext::test_mock(fb);

16
eden/mononoke/derived_data/filenodes/derive.rs
View File

@ -326,7 +326,7 @@ mod tests {
async fn test_generate_filenodes_simple(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let filename = "path";
let commit = CreateCommitContext::new_root(&ctx, &repo)
.add_file(filename, "content")
@ -353,7 +353,7 @@ mod tests {
async fn test_generate_filenodes_merge(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let first_p1 = CreateCommitContext::new_root(&ctx, &repo)
.add_file("path1", "content")
.commit()
@ -382,7 +382,7 @@ mod tests {
async fn test_generate_type_change(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let parent = CreateCommitContext::new_root(&ctx, &repo)
.add_file("path", "content")
.commit()
@ -407,7 +407,7 @@ mod tests {
async fn test_many_parents(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let p1 = CreateCommitContext::new_root(&ctx, &repo)
.add_file("path1", "content")
.commit()
@ -448,7 +448,7 @@ mod tests {
async fn test_derive_empty_commits(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let parent_empty = CreateCommitContext::new_root(&ctx, &repo).commit().await?;
let child_empty = CreateCommitContext::new(&ctx, &repo, vec![parent_empty])
@ -479,7 +479,7 @@ mod tests {
async fn test_derive_only_empty_commits(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let parent_empty = CreateCommitContext::new_root(&ctx, &repo).commit().await?;
let child_empty = CreateCommitContext::new(&ctx, &repo, vec![parent_empty])
@ -520,7 +520,7 @@ mod tests {
async fn test_derive_disabled_filenodes(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let cs = CreateCommitContext::new_root(&ctx, &repo).commit().await?;
let derived = repo
.repo_derived_data()
@ -588,7 +588,7 @@ mod tests {
async fn derive_parents_before_children(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let filenodes_cs_id = Arc::new(Mutex::new(None));
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let repo = factory
.with_filenodes_override({
cloned!(filenodes_cs_id);

2
eden/mononoke/derived_data/fsnodes/batch.rs
View File

@ -279,7 +279,7 @@ mod test {
}
async fn repo_with_merge(ctx: &CoreContext) -> Result<BlobRepo, Error> {
let repo: BlobRepo = TestRepoFactory::new()?.build()?;
let repo: BlobRepo = TestRepoFactory::new(ctx.fb)?.build()?;
let commit_map = create_from_dag(
ctx,

8
eden/mononoke/derived_data/mercurial_derived_data/mapping.rs
View File

@ -328,7 +328,7 @@ mod test {
verify_repo(fb, || UnsharedMergeUneven::getrepo(fb)).await?;
// Create a repo with a few empty commits in a row
verify_repo(fb, || async {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let root_empty = CreateCommitContext::new_root(&ctx, &repo)
.commit()
@ -370,7 +370,7 @@ mod test {
.await?;
verify_repo(fb, || async {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir/subdir/to_replace", "one")
@ -403,7 +403,7 @@ mod test {
// Weird case - let's delete a file that was already replaced with a directory
verify_repo(fb, || async {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir/subdir/to_replace", "one")
@ -437,7 +437,7 @@ mod test {
// Add renames
verify_repo(fb, || async {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir", "one")

2
eden/mononoke/derived_data/skeleton_manifest/batch.rs
View File

@ -259,7 +259,7 @@ mod test {
}
async fn repo_with_merge(ctx: &CoreContext) -> Result<BlobRepo, Error> {
let repo: BlobRepo = TestRepoFactory::new()?.build()?;
let repo: BlobRepo = TestRepoFactory::new(ctx.fb)?.build()?;
let commit_map = create_from_dag(
ctx,

2
eden/mononoke/derived_data/skeleton_manifest/derive.rs
View File

@ -383,7 +383,7 @@ mod test {
}
async fn init_repo(ctx: &CoreContext) -> Result<(BlobRepo, BTreeMap<String, ChangesetId>)> {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(ctx.fb).unwrap();
let changesets = create_from_dag_with_changes(
ctx,
&repo,

16
eden/mononoke/derived_data/src/batch.rs
View File

@ -290,7 +290,7 @@ mod test {
#[fbinit::test]
async fn test_split_batch_in_linear_stacks_simple(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let file1 = "file1";
let root = CreateCommitContext::new_root(&ctx, &repo)
@ -386,7 +386,7 @@ mod test {
#[fbinit::test]
async fn test_split_batch_in_linear_stacks_with_limit(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let file1 = "file1";
let root = CreateCommitContext::new_root(&ctx, &repo)
@ -450,7 +450,7 @@ mod test {
}
#[fbinit::test]
async fn test_split_batch_in_linear_stacks_merge(fb: FacebookInit) -> Result<(), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let ctx = CoreContext::test_mock(fb);
let file1 = "file1";
@ -524,7 +524,7 @@ mod test {
async fn test_split_batch_in_linear_stacks_replace_dir_with_file(
fb: FacebookInit,
) -> Result<(), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let ctx = CoreContext::test_mock(fb);
let dir = "dir";
@ -567,7 +567,7 @@ mod test {
#[fbinit::test]
async fn test_split_batch_in_linear_stacks_delete_file(fb: FacebookInit) -> Result<(), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let ctx = CoreContext::test_mock(fb);
let file1 = "file1";
@ -608,7 +608,7 @@ mod test {
async fn test_split_batch_in_linear_stacks_add_same_file(
fb: FacebookInit,
) -> Result<(), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let ctx = CoreContext::test_mock(fb);
let file1 = "file1";
@ -675,7 +675,7 @@ mod test {
fb: FacebookInit,
) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir", "content1")
@ -730,7 +730,7 @@ mod test {
#[fbinit::test]
async fn test_split_batch_in_linear_stacks_copy_info(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir", "content1")

5
eden/mononoke/derived_data/test/derived_generation/lib.rs
View File

@ -13,6 +13,7 @@ use async_trait::async_trait;
use blobstore::{BlobstoreBytes, BlobstoreGetData};
use bytes::Bytes;
use context::CoreContext;
use fbinit::FacebookInit;
use mononoke_types::{BonsaiChangeset, ChangesetId};
use test_repo_factory::TestRepoFactory;
@ -132,8 +133,8 @@ impl BonsaiDerivable for DerivedGeneration {
}
}
pub fn make_test_repo_factory() -> TestRepoFactory {
let mut factory = TestRepoFactory::new().unwrap();
pub fn make_test_repo_factory(fb: FacebookInit) -> TestRepoFactory {
let mut factory = TestRepoFactory::new(fb).unwrap();
factory.with_config_override(|repo_config| {
repo_config
.derived_data_config

12
eden/mononoke/derived_data/test/main.rs
View File

@ -67,7 +67,7 @@ async fn derive_for_master(
#[fbinit::test]
async fn test_derive_fixtures(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let mut factory = make_test_repo_factory();
let mut factory = make_test_repo_factory(fb);
let repo = factory.with_id(RepositoryId::new(1)).build()?;
BranchEven::initrepo(fb, &repo).await;
@ -117,7 +117,7 @@ async fn test_derive_fixtures(fb: FacebookInit) -> Result<()> {
/// derived changesets do not have their parents derived).
async fn test_gapped_derivation(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo = make_test_repo_factory().build()?;
let repo = make_test_repo_factory(fb).build()?;
Linear::initrepo(fb, &repo).await;
let master = repo
@ -174,7 +174,7 @@ async fn test_gapped_derivation(fb: FacebookInit) -> Result<()> {
#[fbinit::test]
async fn test_leases(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo = make_test_repo_factory().build()?;
let repo = make_test_repo_factory(fb).build()?;
Linear::initrepo(fb, &repo).await;
let master = repo
@ -273,7 +273,7 @@ impl LeaseOps for FailingLease {
#[fbinit::test]
async fn test_always_failing_lease(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo = make_test_repo_factory()
let repo = make_test_repo_factory(fb)
.with_derived_data_lease(|| Arc::new(FailingLease))
.build()?;
Linear::initrepo(fb, &repo).await;
@ -314,7 +314,7 @@ async fn test_always_failing_lease(fb: FacebookInit) -> Result<(), Error> {
#[fbinit::test]
async fn test_parallel_derivation(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = make_test_repo_factory().build()?;
let repo: BlobRepo = make_test_repo_factory(fb).build()?;
// Create a commit with lots of parents, and make each derivation take
// 2 seconds. Check that derivations happen in parallel by ensuring
@ -381,7 +381,7 @@ async fn ensure_tunables_disable_derivation(
/// the appropriate values in tunables.
async fn test_cancelling_slow_derivation(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = make_test_repo_factory().build()?;
let repo: BlobRepo = make_test_repo_factory(fb).build()?;
let create_tunables = || {
let tunables = MononokeTunables::default();

4
eden/mononoke/derived_data/unodes/derive.rs
View File

@ -661,7 +661,7 @@ mod tests {
async fn diamond_merge_unodes_v2(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let repo: BlobRepo = factory.build()?;
let merged_files = "dir/file.txt";
let root_commit = CreateCommitContext::new_root(&ctx, &repo)
@ -763,7 +763,7 @@ mod tests {
#[fbinit::test]
async fn test_parent_order(fb: FacebookInit) -> Result<(), Error> {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let derivation_ctx = repo.repo_derived_data().manager().derivation_context(None);
let ctx = CoreContext::test_mock(fb);

2
eden/mononoke/derived_data/unodes/lib.rs
View File

@ -179,7 +179,7 @@ mod tests {
#[fbinit::test]
async fn test_find_unode_rename_sources(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
borrowed!(ctx, repo);
let c1 = CreateCommitContext::new_root(ctx, repo)

6
eden/mononoke/derived_data/unodes/mapping.rs
View File

@ -381,7 +381,7 @@ mod test {
verify_repo(fb, || UnsharedMergeUneven::getrepo(fb)).await;
// Create a repo with a few empty commits in a row
verify_repo(fb, || async {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let root_empty = CreateCommitContext::new_root(&ctx, &repo)
.commit()
@ -423,7 +423,7 @@ mod test {
.await;
verify_repo(fb, || async {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir/subdir/to_replace", "one")
@ -456,7 +456,7 @@ mod test {
// Weird case - let's delete a file that was already replaced with a directory
verify_repo(fb, || async {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let ctx = CoreContext::test_mock(fb);
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir/subdir/to_replace", "one")

4
eden/mononoke/derived_data/utils/lib.rs
View File

@ -1168,7 +1168,7 @@ mod tests {
#[fbinit::test]
async fn test_find_underived_many(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let dag = create_from_dag(&ctx, &repo, "A-B-C").await?;
let a = *dag.get("A").unwrap();
let b = *dag.get("B").unwrap();
@ -1235,7 +1235,7 @@ mod tests {
#[fbinit::test]
async fn multiple_independent_mappings(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let dag = create_from_dag(&ctx, &repo, "A-B-C").await?;
let a = *dag.get("A").unwrap();
let b = *dag.get("B").unwrap();

8
eden/mononoke/hooks/hooks-tests/src/lib.rs
View File

@ -928,7 +928,7 @@ async fn test_file_hook_length(fb: FacebookInit) {
async fn test_cs_find_content_hook_with_blob_store(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
// set up a blobrepo
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("dir/file", "dir/file")
.add_file("dir-2/file", "dir-2/file")
@ -1019,7 +1019,7 @@ async fn test_cs_find_content_hook_with_blob_store(fb: FacebookInit) -> Result<(
async fn test_cs_file_changes_hook_with_blob_store(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
// set up a blobrepo
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("file", "file")
.add_file("dir/file", "dir/file")
@ -1076,7 +1076,7 @@ async fn test_cs_file_changes_hook_with_blob_store(fb: FacebookInit) -> Result<(
async fn test_cs_latest_changes_hook_with_blob_store(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
// set up a blobrepo
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root_id = CreateCommitContext::new_root(&ctx, &repo)
.add_file("file", "file")
.commit()
@ -1144,7 +1144,7 @@ async fn test_file_hooks_with_blob_store(fb: FacebookInit) {
let ctx = CoreContext::test_mock(fb);
// Create an init a repo
let (repo, bcs_id) = {
let repo: BlobRepo = test_repo_factory::build_empty().unwrap();
let repo: BlobRepo = test_repo_factory::build_empty(fb).unwrap();
let parent = create_commit(
ctx.clone(),

8
eden/mononoke/hooks/src/rust_hooks/limit_commitsize.rs
View File

@ -234,7 +234,7 @@ mod test {
#[fbinit::test]
async fn test_limitcommitsize(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
borrowed!(ctx, repo);
let cs_id = CreateCommitContext::new_root(ctx, repo)
@ -314,7 +314,7 @@ mod test {
#[fbinit::test]
async fn test_limitcommitsize_removed_files(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
borrowed!(ctx, repo);
let parent_cs_id = CreateCommitContext::new_root(ctx, repo)
@ -374,7 +374,7 @@ mod test {
#[fbinit::test]
async fn test_limitcommitsize_override(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
borrowed!(ctx, repo);
let cs_id = CreateCommitContext::new_root(ctx, repo)
@ -418,7 +418,7 @@ mod test {
#[fbinit::test]
async fn test_limitcommitsize_override_hits_limit(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
borrowed!(ctx, repo);
let cs_id = CreateCommitContext::new_root(ctx, repo)

4
eden/mononoke/lfs_server/src/batch.rs
View File

@ -1021,7 +1021,7 @@ mod test {
#[fbinit::test]
async fn test_resolve_redacted(fb: FacebookInit) -> Result<(), Error> {
// Create a single factory with a blobstore we've created.
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(fb)?;
let stub_blobstore = Arc::new(Memblob::default());
factory.with_blobstore(stub_blobstore.clone());
@ -1096,7 +1096,7 @@ mod test {
#[fbinit::test]
async fn test_resolve_size(fb: FacebookInit) -> Result<(), Error> {
let repo = TestRepoFactory::new()?.build::<BlobRepo>()?;
let repo = TestRepoFactory::new(fb)?.build::<BlobRepo>()?;
let meta = filestore::store(
repo.blobstore(),

2
eden/mononoke/lfs_server/src/download.rs
View File

@ -226,7 +226,7 @@ mod test {
let content_id = ONES_CTID;
let reason = "test reason";
let repo = TestRepoFactory::new()?
let repo = TestRepoFactory::new(fb)?
.redacted(Some(RedactedBlobs::FromSql(Arc::new(
hashmap! { content_id.blobstore_key() => RedactedMetadata {
task: reason.to_string(),

2
eden/mononoke/lfs_server/src/lfs_server_context.rs
View File

@ -605,7 +605,7 @@ mod test {
pub fn test_builder(fb: FacebookInit) -> Result<TestContextBuilder<'static>, Error> {
Ok(TestContextBuilder {
fb,
repo: TestRepoFactory::new()?.build()?,
repo: TestRepoFactory::new(fb)?.build()?,
self_uris: vec!["http://foo.com/"],
upstream_uri: Some("http://bar.com".to_string()),
config: ServerConfig::default(),

2
eden/mononoke/megarepo_api/commit_transformation/src/lib.rs
View File

@ -661,7 +661,7 @@ mod test {
#[fbinit::test]
async fn test_rewrite_commit(fb: FacebookInit) -> Result<(), Error> {
let repo = TestRepoFactory::new()?.build()?;
let repo = TestRepoFactory::new(fb)?.build()?;
let ctx = CoreContext::test_mock(fb);
let first = CreateCommitContext::new_root(&ctx, &repo)
.add_file("path", "path")

2
eden/mononoke/megarepo_api/src/megarepo_test_utils.rs
View File

@ -35,7 +35,7 @@ pub struct MegarepoTest {
impl MegarepoTest {
pub async fn new(ctx: &CoreContext) -> Result<Self, Error> {
let id = RepositoryId::new(0);
let mut factory = TestRepoFactory::new()?;
let mut factory = TestRepoFactory::new(ctx.fb)?;
factory.with_id(id);
let megarepo_mapping = factory.megarepo_mapping();
let config = factory.repo_config();

10
eden/mononoke/mononoke_api/src/test/test_changeset_diff.rs
View File

@ -25,7 +25,7 @@ use tests_utils::CreateCommitContext;
#[fbinit::test]
async fn test_diff_with_moves(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blobrepo: BlobRepo = test_repo_factory::build_empty()?;
let blobrepo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &blobrepo)
.add_file("file_to_move", "context1")
.commit()
@ -73,7 +73,7 @@ async fn test_diff_with_moves(fb: FacebookInit) -> Result<(), Error> {
#[fbinit::test]
async fn test_diff_with_multiple_copies(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blobrepo: BlobRepo = test_repo_factory::build_empty()?;
let blobrepo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &blobrepo)
.add_file("file_to_copy", "context1")
.commit()
@ -126,7 +126,7 @@ async fn test_diff_with_multiple_copies(fb: FacebookInit) -> Result<(), Error> {
#[fbinit::test]
async fn test_diff_with_multiple_moves(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blobrepo: BlobRepo = test_repo_factory::build_empty()?;
let blobrepo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &blobrepo)
.add_file("file_to_move", "context1")
.commit()
@ -291,7 +291,7 @@ fn check_diff_paths(diff_ctxs: &[ChangesetPathDiffContext], paths: &[&str]) {
#[fbinit::test]
async fn test_ordered_diff(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blobrepo: BlobRepo = test_repo_factory::build_empty()?;
let blobrepo: BlobRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &blobrepo)
.add_file("root", "root")
.commit()
@ -497,7 +497,7 @@ async fn test_ordered_diff(fb: FacebookInit) -> Result<(), Error> {
#[fbinit::test]
async fn test_ordered_root_diff(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let blobrepo: BlobRepo = test_repo_factory::build_empty()?;
let blobrepo: BlobRepo = test_repo_factory::build_empty(fb)?;
// List of file names to test in repo order. Note in particular that
// "j.txt" is after "j/k" even though "." is before "/" in lexicographic

2
eden/mononoke/mononoke_api/src/test/test_file_diff.rs
View File

@ -15,7 +15,7 @@ use tests_utils::drawdag::{changes, create_from_dag_with_changes};
use crate::{headerless_unified_diff, ChangesetId, CoreContext, Repo, RepoContext};
async fn init_repo(ctx: &CoreContext) -> Result<(RepoContext, BTreeMap<String, ChangesetId>)> {
let blob_repo = test_repo_factory::build_empty()?;
let blob_repo = test_repo_factory::build_empty(ctx.fb)?;
let changesets = create_from_dag_with_changes(
ctx,
&blob_repo,

2
eden/mononoke/mononoke_api/src/test/test_history.rs
View File

@ -49,7 +49,7 @@ use crate::{ChangesetHistoryOptions, ChangesetId, ChangesetPathHistoryOptions, R
//
// Commits e1, e2 and e3 are empty (contain no file changes).
async fn init_repo(ctx: &CoreContext) -> Result<(RepoContext, HashMap<&'static str, ChangesetId>)> {
let blob_repo = test_repo_factory::build_empty()?;
let blob_repo = test_repo_factory::build_empty(ctx.fb)?;
let mut changesets = HashMap::new();
changesets.insert(

2
eden/mononoke/mononoke_api/src/test/test_repo_bookmarks.rs
View File

@ -20,7 +20,7 @@ use tests_utils::drawdag::create_from_dag;
use crate::repo::{BookmarkFreshness, Repo, RepoContext};
async fn init_repo(ctx: &CoreContext) -> Result<(RepoContext, BTreeMap<String, ChangesetId>)> {
let blob_repo: BlobRepo = test_repo_factory::build_empty()?;
let blob_repo: BlobRepo = test_repo_factory::build_empty(ctx.fb)?;
let changesets = create_from_dag(
ctx,
&blob_repo,

2
eden/mononoke/mononoke_api/src/test/test_repo_land_stack.rs
View File

@ -21,7 +21,7 @@ use tests_utils::drawdag::create_from_dag;
use crate::repo::{BookmarkFreshness, Repo, RepoContext};
async fn init_repo(ctx: &CoreContext) -> Result<(RepoContext, BTreeMap<String, ChangesetId>)> {
let blob_repo: BlobRepo = test_repo_factory::build_empty()?;
let blob_repo: BlobRepo = test_repo_factory::build_empty(ctx.fb)?;
let changesets = create_from_dag(
ctx,
&blob_repo,

2
eden/mononoke/mononoke_api/src/test/test_repo_modify_bookmarks.rs
View File

@ -20,7 +20,7 @@ use tests_utils::drawdag::create_from_dag;
use crate::repo::{BookmarkFreshness, Repo, RepoContext};
async fn init_repo(ctx: &CoreContext) -> Result<(RepoContext, BTreeMap<String, ChangesetId>)> {
let blob_repo: BlobRepo = test_repo_factory::build_empty()?;
let blob_repo: BlobRepo = test_repo_factory::build_empty(ctx.fb)?;
let changesets = create_from_dag(
ctx,
&blob_repo,

4
eden/mononoke/mononoke_api_hg/src/repo.rs
View File

@ -861,7 +861,7 @@ mod tests {
async fn test_new_hg_context(fb: FacebookInit) -> Result<(), MononokeError> {
let ctx = CoreContext::test_mock(fb);
let blob_repo: BlobRepo = test_repo_factory::build_empty()?;
let blob_repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let repo = Repo::new_test(ctx.clone(), blob_repo).await?;
let repo_ctx = RepoContext::new(ctx, Arc::new(repo)).await?;
@ -874,7 +874,7 @@ mod tests {
#[fbinit::test]
async fn test_trees_under_path(fb: FacebookInit) -> Result<(), MononokeError> {
let ctx = CoreContext::test_mock(fb);
let blob_repo: BlobRepo = test_repo_factory::build_empty()?;
let blob_repo: BlobRepo = test_repo_factory::build_empty(fb)?;
// Create test stack; child commit modifies 2 directories.
let commit_1 = CreateCommitContext::new_root(&ctx, &blob_repo)

12
eden/mononoke/mononoke_hg_sync_job/src/bundle_preparer.rs
View File

@ -668,7 +668,7 @@ mod test {
#[fbinit::test]
async fn test_split_in_batches_simple(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commits = create_from_dag(
&ctx,
@ -704,7 +704,7 @@ mod test {
#[fbinit::test]
async fn test_split_in_batches_all_in_one_batch(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commits = create_from_dag(
&ctx,
@ -741,7 +741,7 @@ mod test {
#[fbinit::test]
async fn test_split_in_batches_different_bookmarks(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commits = create_from_dag(
&ctx,
@ -793,7 +793,7 @@ mod test {
#[fbinit::test]
async fn test_split_in_batches_non_forward_move(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commits = create_from_dag(
&ctx,
@ -840,7 +840,7 @@ mod test {
#[fbinit::test]
async fn test_split_in_batches_weird_move(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commits = create_from_dag(
&ctx,
@ -881,7 +881,7 @@ mod test {
#[fbinit::test]
async fn test_maybe_adjust_batch(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commits = create_from_dag(
&ctx,

4
eden/mononoke/mononoke_hg_sync_job/src/globalrev_syncer.rs
View File

@ -122,10 +122,10 @@ mod test {
async fn test_sync_darkstorm(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let orig_repo: BlobRepo = TestRepoFactory::new()?
let orig_repo: BlobRepo = TestRepoFactory::new(fb)?
.with_id(RepositoryId::new(0))
.build()?;
let darkstorm_repo: BlobRepo = TestRepoFactory::new()?
let darkstorm_repo: BlobRepo = TestRepoFactory::new(fb)?
.with_id(RepositoryId::new(1))
.build()?;

12
eden/mononoke/pushrebase/src/lib.rs
View File

@ -1502,7 +1502,7 @@ mod tests {
let runtime = tokio::runtime::Runtime::new().unwrap();
runtime.block_on(async move {
let ctx = CoreContext::test_mock(fb);
let factory = TestRepoFactory::new()?;
let factory = TestRepoFactory::new(fb)?;
let repo = factory.build()?;
Linear::initrepo(fb, &repo).await;
// Bottom commit of the repo
@ -2699,7 +2699,7 @@ mod tests {
let runtime = tokio::runtime::Runtime::new().unwrap();
runtime.block_on(async move {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let p1 = CreateCommitContext::new_root(&ctx, &repo)
.add_file("p1", "some content")
@ -2842,7 +2842,7 @@ mod tests {
let runtime = tokio::runtime::Runtime::new().unwrap();
runtime.block_on(async move {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
// Pushrebase two branch merges (bcs_id_first_merge and bcs_id_second_merge)
// on top of master
@ -2933,7 +2933,7 @@ mod tests {
let runtime = tokio::runtime::Runtime::new().unwrap();
runtime.block_on(async move {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
// Pushrebase two branch merges (bcs_id_first_merge and bcs_id_second_merge)
// on top of master
@ -3014,7 +3014,7 @@ mod tests {
let runtime = tokio::runtime::Runtime::new().unwrap();
runtime.block_on(async move {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
// Pushrebase two branch merges (bcs_id_first_merge and bcs_id_second_merge)
// on top of master
@ -3168,7 +3168,7 @@ mod tests {
#[fbinit::test]
async fn test_commit_validation(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
// Pushrebase hook that deletes "base" file from the list of file changes
struct InvalidPushrebaseHook {}

2
eden/mononoke/pushrebase_mutation_mapping/src/save_mapping_pushrebase_hook/test.rs
View File

@ -25,7 +25,7 @@ use crate::get_prepushrebase_ids;
async fn pushrebase_saves_mapping(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let mut repo_factory = TestRepoFactory::new()?;
let mut repo_factory = TestRepoFactory::new(fb)?;
let repo: BlobRepo = repo_factory.with_id(repo::REPO_ONE).build()?;
borrowed!(ctx, repo);

16
eden/mononoke/reachabilityindex/skiplist/src/sparse.rs
View File

@ -276,7 +276,7 @@ mod test {
async fn test_index_changeset_merge(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,
@ -315,7 +315,7 @@ mod test {
async fn test_index_cleanup(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,
@ -354,7 +354,7 @@ mod test {
async fn test_index_cleanup_merge(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,
@ -401,7 +401,7 @@ mod test {
async fn test_skiplist_deletions_linear(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,
@ -446,7 +446,7 @@ mod test {
async fn test_build_skiplist_heads(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,
@ -507,7 +507,7 @@ mod test {
) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,
@ -552,7 +552,7 @@ mod test {
async fn test_skiplist_deletions_with_merges(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,
@ -595,7 +595,7 @@ mod test {
async fn test_build_skiplist(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let dag = create_from_dag(
&ctx,

10
eden/mononoke/repo_client/getbundle_response/src/low_gen_nums_optimization.rs
View File

@ -606,7 +606,7 @@ mod test {
#[fbinit::test]
async fn test_compute_partial_getbundle(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commit_map = create_from_dag(
&ctx,
@ -810,7 +810,7 @@ mod test {
fb: FacebookInit,
) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let first = CreateCommitContext::new_root(&ctx, &repo).commit().await?;
@ -871,7 +871,7 @@ mod test {
#[fbinit::test]
async fn test_low_gen_num_two_heads(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commit_map = create_from_dag(
&ctx,
@ -1000,7 +1000,7 @@ mod test {
async fn create_repo(
ctx: &CoreContext,
) -> Result<(BlobRepo, BTreeMap<String, ChangesetId>), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(ctx.fb)?;
let commit_map = create_from_dag(
ctx,
@ -1018,7 +1018,7 @@ mod test {
async fn create_mergy_repo(
ctx: &CoreContext,
) -> Result<(BlobRepo, BTreeMap<String, ChangesetId>), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(ctx.fb)?;
let commit_map = create_from_dag(
ctx,

6
eden/mononoke/repo_client/remotefilelog/src/lib.rs
View File

@ -408,7 +408,7 @@ mod test {
#[fbinit::test]
async fn test_prepare_blob(fb: FacebookInit) -> Result<(), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let blob = roundtrip_blob(fb, &repo, "foo", Some(3)).await?;
assert_matches!(blob, RemotefilelogBlobKind::Inline(3));
Ok(())
@ -416,7 +416,7 @@ mod test {
#[fbinit::test]
async fn test_prepare_blob_chunked(fb: FacebookInit) -> Result<(), Error> {
let repo: BlobRepo = TestRepoFactory::new()?
let repo: BlobRepo = TestRepoFactory::new(fb)?
.with_config_override(|config| {
config.filestore = Some(FilestoreParams {
chunk_size: 1,
@ -432,7 +432,7 @@ mod test {
#[fbinit::test]
async fn test_prepare_blob_lfs(fb: FacebookInit) -> Result<(), Error> {
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let blob = roundtrip_blob(fb, &repo, "foo", Some(2)).await?;
assert_matches!(blob, RemotefilelogBlobKind::Lfs(3));
Ok(())

2
eden/mononoke/repo_client/src/client/session_bookmarks_cache.rs
View File

@ -303,7 +303,7 @@ mod test {
async fn test_fetch_prefix_no_warm_bookmark_cache(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: InnerRepo = test_repo_factory::build_empty()?;
let repo: InnerRepo = test_repo_factory::build_empty(fb)?;
let cs_id = CreateCommitContext::new_root(&ctx, &repo.blob_repo)
.add_file("1", "1")

4
eden/mononoke/repo_client/src/client/tests.rs
View File

@ -250,7 +250,7 @@ async fn get_changed_manifests_stream_test_base_path_impl(fb: FacebookInit) -> R
#[fbinit::test]
async fn test_lfs_rollout(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commit = CreateCommitContext::new_root(&ctx, &repo)
.add_file("largefile", "11111_11111")
.commit()
@ -316,7 +316,7 @@ async fn test_lfs_rollout(fb: FacebookInit) -> Result<(), Error> {
#[fbinit::test]
async fn test_maybe_validate_pushed_bonsais(fb: FacebookInit) -> Result<(), Error> {
let ctx = CoreContext::test_mock(fb);
let repo: BlobRepo = test_repo_factory::build_empty()?;
let repo: BlobRepo = test_repo_factory::build_empty(fb)?;
let commit = CreateCommitContext::new_root(&ctx, &repo)
.add_file("largefile", "11111_11111")
.commit()

14
eden/mononoke/repo_client/unbundle/src/changegroup/filelog.rs
View File

@ -354,9 +354,10 @@ mod tests {
I: IntoIterator<Item = FilelogDeltaed>,
J: IntoIterator<Item = Filelog>,
{
let repo_factory = test_repo_factory::build_empty(ctx.fb).unwrap();
let result = convert_to_revlog_filelog(
ctx,
test_repo_factory::build_empty().unwrap(),
repo_factory,
iter(inp.into_iter().map(Ok).collect::<Vec<_>>()),
)
.try_collect::<Vec<_>>()
@ -512,13 +513,10 @@ mod tests {
vec![f2_deltaed, f1_deltaed]
};
let result = convert_to_revlog_filelog(
ctx,
test_repo_factory::build_empty().unwrap(),
iter(inp.into_iter().map(Ok)),
)
.try_collect::<Vec<_>>()
.await;
let repo_factory = test_repo_factory::build_empty(ctx.fb).unwrap();
let result = convert_to_revlog_filelog(ctx, repo_factory, iter(inp.into_iter().map(Ok)))
.try_collect::<Vec<_>>()
.await;
match result {
Ok(_) => assert!(

1
eden/mononoke/repo_factory/test_repo_factory/Cargo.toml
View File

@ -28,6 +28,7 @@ derived_data_manager = { version = "0.1.0", path = "../../derived_data/manager"
ephemeral_blobstore = { version = "0.1.0", path = "../../blobstore/ephemeral_blobstore" }
facet = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
fastlog = { version = "0.1.0", path = "../../derived_data/fastlog" }
fbinit = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
filenodes = { version = "0.1.0", path = "../../filenodes" }
filestore = { version = "0.1.0", path = "../../filestore" }
fsnodes = { version = "0.1.0", path = "../../derived_data/fsnodes" }

12
eden/mononoke/repo_factory/test_repo_factory/src/lib.rs
View File

@ -29,6 +29,7 @@ use derived_data_filenodes::FilenodesOnlyPublic;
use derived_data_manager::BonsaiDerivable;
use ephemeral_blobstore::{ArcRepoEphemeralStore, RepoEphemeralStore};
use fastlog::RootFastlog;
use fbinit::FacebookInit;
use filenodes::ArcFilenodes;
use filestore::{ArcFilestoreConfig, FilestoreConfig};
use fsnodes::RootFsnodeId;
@ -78,6 +79,8 @@ use unodes::RootUnodeManifestId;
/// By default, it will use a single in-memory blobstore and a single
/// in-memory metadata database for all repositories.
pub struct TestRepoFactory {
/// Sometimes needed to construct a facet
pub fb: FacebookInit,
name: String,
config: RepoConfig,
blobstore: Arc<dyn Blobstore>,
@ -123,17 +126,18 @@ pub fn default_test_repo_config() -> RepoConfig {
///
/// This covers the simplest case. For more complicated repositories, use
/// `TestRepoFactory`.
pub fn build_empty<R>() -> Result<R>
pub fn build_empty<R>(fb: FacebookInit) -> Result<R>
where
R: for<'builder> facet::Buildable<TestRepoFactoryBuilder<'builder>>,
{
Ok(TestRepoFactory::new()?.build()?)
Ok(TestRepoFactory::new(fb)?.build()?)
}
impl TestRepoFactory {
/// Create a new factory for test repositories with default settings.
pub fn new() -> Result<TestRepoFactory> {
pub fn new(fb: FacebookInit) -> Result<TestRepoFactory> {
Self::with_sqlite_connection(
fb,
SqliteConnection::open_in_memory()?,
SqliteConnection::open_in_memory()?,
)
@ -142,6 +146,7 @@ impl TestRepoFactory {
/// Create a new factory for test repositories with an existing Sqlite
/// connection.
pub fn with_sqlite_connection(
fb: FacebookInit,
metadata_con: SqliteConnection,
hg_mutation_con: SqliteConnection,
) -> Result<TestRepoFactory> {
@ -166,6 +171,7 @@ impl TestRepoFactory {
SqlConnectionsWithSchema::new_single(Connection::with_sqlite(hg_mutation_con));
Ok(TestRepoFactory {
fb,
name: "repo".to_string(),
config: default_test_repo_config(),
blobstore: Arc::new(Memblob::default()),

40
eden/mononoke/repo_import/src/tests.rs
View File

@ -70,8 +70,8 @@ mod tests {
MPath::new(s).unwrap()
}
fn create_repo(id: i32) -> Result<Repo> {
let repo: Repo = TestRepoFactory::new()?
fn create_repo(fb: FacebookInit, id: i32) -> Result<Repo> {
let repo: Repo = TestRepoFactory::new(fb)?
.with_config_override(|config| {
config
.derived_data_config
@ -119,7 +119,7 @@ mod tests {
#[fbinit::test]
async fn test_move_bookmark(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: Repo = test_repo_factory::build_empty()?;
let repo: Repo = test_repo_factory::build_empty(fb)?;
let mut recovery_fields = create_mock_recovery_fields();
let call_sign = Some("FBS".to_string());
let checker_flags = CheckerFlags {
@ -179,7 +179,7 @@ mod tests {
#[fbinit::test]
async fn test_move_bookmark_with_existing_bookmark(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: Repo = test_repo_factory::build_empty()?;
let repo: Repo = test_repo_factory::build_empty(fb)?;
let mut recovery_fields = create_mock_recovery_fields();
let checker_flags = CheckerFlags {
phab_check_disabled: true,
@ -254,7 +254,7 @@ mod tests {
#[fbinit::test]
async fn test_hg_sync_check(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: Repo = test_repo_factory::build_empty()?;
let repo: Repo = test_repo_factory::build_empty(fb)?;
let checker_flags = CheckerFlags {
phab_check_disabled: true,
x_repo_check_disabled: true,
@ -316,7 +316,7 @@ mod tests {
#[fbinit::test]
async fn test_merge_push_commit(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo = create_repo(1)?;
let repo = create_repo(fb, 1)?;
let master_cs_id = CreateCommitContext::new_root(&ctx, repo.as_blob_repo())
.add_file("a", "a")
@ -452,7 +452,7 @@ mod tests {
let config_store = ConfigStore::new(test_source.clone(), Duration::from_millis(2), None);
let live_commit_sync_config = CfgrLiveCommitSyncConfig::new(ctx.logger(), &config_store)?;
let repo0 = create_repo(0)?;
let repo0 = create_repo(fb, 0)?;
insert_repo_config(0, &mut repos);
assert!(
@ -461,7 +461,7 @@ mod tests {
.is_none()
);
let repo1 = create_repo(1)?;
let repo1 = create_repo(fb, 1)?;
insert_repo_config(1, &mut repos);
assert!(
@ -470,7 +470,7 @@ mod tests {
.is_some()
);
let repo2 = create_repo(2)?;
let repo2 = create_repo(fb, 2)?;
insert_repo_config(2, &mut repos);
assert!(
@ -576,8 +576,8 @@ mod tests {
async fn test_get_large_repo_setting(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let mapping = SqlSyncedCommitMapping::with_sqlite_in_memory().unwrap();
let large_repo = create_repo(0)?;
let small_repo_1 = create_repo(1)?;
let large_repo = create_repo(fb, 0)?;
let small_repo_1 = create_repo(fb, 1)?;
let small_repo_setting_1 = RepoImportSetting {
importing_bookmark: create_bookmark_name("importing_bookmark"),
@ -604,7 +604,7 @@ mod tests {
assert_eq!(expected_large_repo_setting_1, large_repo_setting_1);
let small_repo_2 = create_repo(2)?;
let small_repo_2 = create_repo(fb, 2)?;
let small_repo_setting_2 = RepoImportSetting {
importing_bookmark: create_bookmark_name("importing_bookmark_2"),
@ -650,8 +650,8 @@ mod tests {
#[fbinit::test]
async fn test_rewrite_file_paths_and_backsync(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let large_repo = create_repo(0)?;
let small_repo = create_repo(1)?;
let large_repo = create_repo(fb, 0)?;
let small_repo = create_repo(fb, 1)?;
let changesets = create_from_dag(
&ctx,
large_repo.as_blob_repo(),
@ -767,7 +767,7 @@ mod tests {
#[fbinit::test]
async fn test_derive_bonsais_multiple_repos(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo_0 = create_repo(0)?;
let repo_0 = create_repo(fb, 0)?;
let repo_0_commits = create_from_dag(
&ctx,
@ -780,7 +780,7 @@ mod tests {
let repo_0_cs_ids: Vec<ChangesetId> = repo_0_commits.values().copied().collect();
let repo_1 = create_repo(1)?;
let repo_1 = create_repo(fb, 1)?;
let repo_1_commits = create_from_dag(
&ctx,
repo_1.as_blob_repo(),
@ -808,8 +808,8 @@ mod tests {
#[fbinit::test]
async fn test_rewrite_and_derive(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let large_repo = create_repo(0)?;
let small_repo = create_repo(1)?;
let large_repo = create_repo(fb, 0)?;
let small_repo = create_repo(fb, 1)?;
let changesets = create_from_dag(
&ctx,
large_repo.as_blob_repo(),
@ -880,8 +880,8 @@ mod tests {
#[fbinit::test]
async fn test_find_version_and_backsync(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let large_repo = create_repo(0)?;
let small_repo = create_repo(1)?;
let large_repo = create_repo(fb, 0)?;
let small_repo = create_repo(fb, 1)?;
let root = CreateCommitContext::new_root(&ctx, large_repo.as_blob_repo())
.add_file("random_dir/B/file", "text")

2
eden/mononoke/tests/fixtures/src/lib.rs vendored
View File

@ -168,7 +168,7 @@ pub trait TestRepoFixture {
}
async fn get_inner_repo_with_id(fb: FacebookInit, id: RepositoryId) -> InnerRepo {
let repo: InnerRepo = TestRepoFactory::new()
let repo: InnerRepo = TestRepoFactory::new(fb)
.unwrap()
.with_id(id)
.with_name(Self::REPO_NAME.to_string())

6
eden/mononoke/tools/admin/src/commands/commit/split.rs
View File

@ -240,7 +240,7 @@ mod test {
#[fbinit::test]
async fn test_split_commit_simple(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: TestRepo = test_repo_factory::build_empty()?;
let repo: TestRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("first", "a")
@ -332,7 +332,7 @@ mod test {
#[fbinit::test]
async fn test_split_commit_with_renames(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: TestRepo = test_repo_factory::build_empty()?;
let repo: TestRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("first", "a")
@ -374,7 +374,7 @@ mod test {
#[fbinit::test]
async fn test_split_commit_renamed_to_multiple_dest(fb: FacebookInit) -> Result<()> {
let ctx = CoreContext::test_mock(fb);
let repo: TestRepo = test_repo_factory::build_empty()?;
let repo: TestRepo = test_repo_factory::build_empty(fb)?;
let root = CreateCommitContext::new_root(&ctx, &repo)
.add_file("first", "a")