diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-26 16:07:58 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-05 12:58:35 +0200 |
| commit | 5bc6265b2ffe43370b4cddd0a9e4c09b059ef131 (patch) | |
| tree | 63619c3d43f97c4ffa16feb9094fc8631620b164 /test/other_tools/git_operations/git_repo_remote.test.cpp | |
| parent | 3440784e94de51c95d3dcca8509f8e46b4722ee6 (diff) | |
| download | justbuild-5bc6265b2ffe43370b4cddd0a9e4c09b059ef131.tar.gz | |
Pass StorageConfig to git_repo and git_repo_remote
Diffstat (limited to 'test/other_tools/git_operations/git_repo_remote.test.cpp')
| -rw-r--r-- | test/other_tools/git_operations/git_repo_remote.test.cpp | 61 |
1 files changed, 41 insertions, 20 deletions
diff --git a/test/other_tools/git_operations/git_repo_remote.test.cpp b/test/other_tools/git_operations/git_repo_remote.test.cpp index 0a970db8..89bfad23 100644 --- a/test/other_tools/git_operations/git_repo_remote.test.cpp +++ b/test/other_tools/git_operations/git_repo_remote.test.cpp @@ -26,6 +26,7 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/utils/cpp/atomic.hpp" #include "test/utils/shell_quoting.hpp" @@ -250,8 +251,13 @@ TEST_CASE("Single-threaded fake repository operations", "[git_repo_remote]") { *repo_fetch_all->CheckCommitExists(kRootCommit, logger)); // fetch all with base refspecs - REQUIRE(repo_fetch_all->FetchViaTmpRepo( - *repo_path, std::nullopt, {}, "git", {}, logger)); + REQUIRE(repo_fetch_all->FetchViaTmpRepo(StorageConfig::Instance(), + *repo_path, + std::nullopt, + {}, + "git", + {}, + logger)); // check commit is there after fetch CHECK(*repo_fetch_all->CheckCommitExists(kRootCommit, logger)); @@ -269,8 +275,14 @@ TEST_CASE("Single-threaded fake repository operations", "[git_repo_remote]") { *repo_fetch_wRefspec->CheckCommitExists(kRootCommit, logger)); // fetch all - REQUIRE(repo_fetch_wRefspec->FetchViaTmpRepo( - *repo_path, "master", {}, "git", {}, logger)); + REQUIRE( + repo_fetch_wRefspec->FetchViaTmpRepo(StorageConfig::Instance(), + *repo_path, + "master", + {}, + "git", + {}, + logger)); // check commit is there after fetch CHECK(*repo_fetch_wRefspec->CheckCommitExists(kRootCommit, logger)); @@ -284,8 +296,14 @@ TEST_CASE("Single-threaded fake repository operations", "[git_repo_remote]") { REQUIRE(repo_commit_upd); // do remote ls - auto fetched_commit = repo_commit_upd->UpdateCommitViaTmpRepo( - *repo_path, "master", {}, "git", {}, logger); + auto fetched_commit = + repo_commit_upd->UpdateCommitViaTmpRepo(StorageConfig::Instance(), + *repo_path, + "master", + {}, + "git", + {}, + logger); REQUIRE(fetched_commit); CHECK(*fetched_commit == kRootCommit); @@ -345,28 +363,31 @@ TEST_CASE("Multi-threaded fake repository operations", "[git_repo_remote]") { } break; case 1: { // fetch with base refspecs - CHECK( - target_repo->FetchViaTmpRepo(*remote_repo_path, - std::nullopt, - {}, - "git", - {}, - logger)); + CHECK(target_repo->FetchViaTmpRepo( + StorageConfig::Instance(), + *remote_repo_path, + std::nullopt, + {}, + "git", + {}, + logger)); } break; case 2: { // fetch specific branch - CHECK( - target_repo->FetchViaTmpRepo(*remote_repo_path, - "master", - {}, - "git", - {}, - logger)); + CHECK(target_repo->FetchViaTmpRepo( + StorageConfig::Instance(), + *remote_repo_path, + "master", + {}, + "git", + {}, + logger)); } break; case 3: { // do remote ls auto fetched_commit = target_repo->UpdateCommitViaTmpRepo( + StorageConfig::Instance(), *remote_repo_path, "master", {}, |