tests: don't create workspaces in conflict tests
@@ -21,8 +21,8 @@ use jujutsu_lib::testutils;
#[test]
fn test_materialize_conflict_basic() {
let settings = testutils::user_settings();
- let test_workspace = testutils::init_workspace(&settings, false);
- let store = test_workspace.repo.store();
+ let test_repo = testutils::init_repo(&settings, false);
+ let store = test_repo.repo.store();
let path = RepoPath::from_internal_string("file");
let base_id = testutils::write_file(
@@ -101,8 +101,8 @@ line 5
#[test]
fn test_materialize_conflict_modify_delete() {
let settings = testutils::user_settings();
- let test_workspace = testutils::init_workspace(&settings, false);
- let store = test_workspace.repo.store();
+ let test_repo = testutils::init_repo(&settings, false);
+ let store = test_repo.repo.store();
let path = RepoPath::from_internal_string("file");
let base_id = testutils::write_file(
@@ -179,8 +179,8 @@ line 5
#[test]
fn test_materialize_conflict_delete_modify() {
let settings = testutils::user_settings();
- let test_workspace = testutils::init_workspace(&settings, false);
- let store = test_workspace.repo.store();
+ let test_repo = testutils::init_repo(&settings, false);
+ let store = test_repo.repo.store();
let path = RepoPath::from_internal_string("file");
let base_id = testutils::write_file(
@@ -423,8 +423,8 @@ line 5
#[test]
fn test_update_conflict_from_content() {
let settings = testutils::user_settings();
- let test_workspace = testutils::init_workspace(&settings, false);
- let store = test_workspace.repo.store();
+ let test_repo = testutils::init_repo(&settings, false);
+ let store = test_repo.repo.store();
let path = RepoPath::from_internal_string("dir/file");
let base_file_id = testutils::write_file(store, &path, "line 1\nline 2\nline 3\n");
