diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-04 12:25:20 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-05 13:32:39 +0200 |
| commit | 5140befaa10f65145fe041b416b7764127efc379 (patch) | |
| tree | 9bb8d66c31455d275e5870e69c10d31789fb6c0a /test/buildtool/execution_engine/executor | |
| parent | e8992e622278d093165b3a0d8271a14424b61775 (diff) | |
| download | justbuild-5140befaa10f65145fe041b416b7764127efc379.tar.gz | |
Convert Storage to a general class
Diffstat (limited to 'test/buildtool/execution_engine/executor')
| -rw-r--r-- | test/buildtool/execution_engine/executor/executor_api_local.test.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp index ea6baa60..ae6c3d4e 100644 --- a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp +++ b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp @@ -30,16 +30,18 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "Executor<LocalApi>: Upload blob", "[executor]") { + auto const storage = Storage::Create(&StorageConfig::Instance()); RepositoryConfig repo_config{}; TestBlobUpload(&repo_config, [&] { return std::make_unique<LocalApi>( - &StorageConfig::Instance(), &Storage::Instance(), &repo_config); + &StorageConfig::Instance(), &storage, &repo_config); }); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Executor<LocalApi>: Compile hello world", "[executor]") { + auto const storage = Storage::Create(&StorageConfig::Instance()); RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; @@ -51,7 +53,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, &progress, [&] { return std::make_unique<LocalApi>( - &StorageConfig::Instance(), &Storage::Instance(), &repo_config); + &StorageConfig::Instance(), &storage, &repo_config); }, &*auth_config); } @@ -59,6 +61,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, TEST_CASE_METHOD(HermeticLocalTestFixture, "Executor<LocalApi>: Compile greeter", "[executor]") { + auto const storage = Storage::Create(&StorageConfig::Instance()); RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; @@ -70,7 +73,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, &progress, [&] { return std::make_unique<LocalApi>( - &StorageConfig::Instance(), &Storage::Instance(), &repo_config); + &StorageConfig::Instance(), &storage, &repo_config); }, &*auth_config); } @@ -78,6 +81,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, TEST_CASE_METHOD(HermeticLocalTestFixture, "Executor<LocalApi>: Upload and download trees", "[executor]") { + auto const storage = Storage::Create(&StorageConfig::Instance()); RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; @@ -89,7 +93,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, &progress, [&] { return std::make_unique<LocalApi>( - &StorageConfig::Instance(), &Storage::Instance(), &repo_config); + &StorageConfig::Instance(), &storage, &repo_config); }, &*auth_config); } @@ -97,6 +101,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, TEST_CASE_METHOD(HermeticLocalTestFixture, "Executor<LocalApi>: Retrieve output directories", "[executor]") { + auto const storage = Storage::Create(&StorageConfig::Instance()); RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; @@ -108,7 +113,7 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, &progress, [&] { return std::make_unique<LocalApi>( - &StorageConfig::Instance(), &Storage::Instance(), &repo_config); + &StorageConfig::Instance(), &storage, &repo_config); }, &*auth_config); } |