Pass RetryConfig instance to Executor

3 files changed, 20 insertions, 0 deletions

diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index 3ac12f80..f6640f01 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -27,6 +27,7 @@
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/execution_api/common", "common"]
     , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
     , ["@", "src", "src/buildtool/execution_engine/executor", "executor"]
diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp
index f58f4ef4..5d3a1b6e 100644
--- a/test/buildtool/execution_engine/executor/executor.test.cpp
+++ b/test/buildtool/execution_engine/executor/executor.test.cpp
@@ -289,6 +289,7 @@ TEST_CASE("Executor: Process artifact", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -309,6 +310,7 @@ TEST_CASE("Executor: Process artifact", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -329,6 +331,7 @@ TEST_CASE("Executor: Process artifact", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -370,6 +373,7 @@ TEST_CASE("Executor: Process action", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -393,6 +397,7 @@ TEST_CASE("Executor: Process action", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -416,6 +421,7 @@ TEST_CASE("Executor: Process action", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -442,6 +448,7 @@ TEST_CASE("Executor: Process action", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -465,6 +472,7 @@ TEST_CASE("Executor: Process action", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
@@ -491,6 +499,7 @@ TEST_CASE("Executor: Process action", "[executor]") {
                         /*properties=*/{},
                         /*dispatch_list=*/{},
                         &auth,
+                        &RetryConfig::Instance(),
                         &stats,
                         &progress};
 
diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp
index 6689a87c..3fa1e113 100644
--- a/test/buildtool/execution_engine/executor/executor_api.test.hpp
+++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp
@@ -26,6 +26,7 @@
 #include "gsl/gsl"
 #include "src/buildtool/common/artifact.hpp"
 #include "src/buildtool/common/artifact_description.hpp"
+#include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/common/statistics.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
@@ -93,6 +94,7 @@ static inline void RunHelloWorldCompilation(
     gsl::not_null<Progress*> const& progress,
     ApiFactory const& factory,
     gsl::not_null<Auth const*> const& auth,
+
     bool is_hermetic = true,
     int expected_queued = 0,
     int expected_cached = 0) {
@@ -135,6 +137,7 @@ static inline void RunHelloWorldCompilation(
                     remote_config->platform_properties,
                     remote_config->dispatch,
                     auth,
+                    &RetryConfig::Instance(),
                     stats,
                     progress};
 
@@ -261,6 +264,7 @@ static inline void RunGreeterCompilation(
                     remote_config->platform_properties,
                     remote_config->dispatch,
                     auth,
+                    &RetryConfig::Instance(),
                     stats,
                     progress};
 
@@ -427,6 +431,7 @@ static inline void TestUploadAndDownloadTrees(
                     remote_config->platform_properties,
                     remote_config->dispatch,
                     auth,
+                    &RetryConfig::Instance(),
                     stats,
                     progress};
     REQUIRE(runner.Process(g.ArtifactNodeWithId(foo_id)));
@@ -594,6 +599,7 @@ static inline void TestRetrieveOutputDirectories(
                         remote_config->platform_properties,
                         remote_config->dispatch,
                         auth,
+                        &RetryConfig::Instance(),
                         stats,
                         progress};
         REQUIRE(runner.Process(action));
@@ -648,6 +654,7 @@ static inline void TestRetrieveOutputDirectories(
                         remote_config->platform_properties,
                         remote_config->dispatch,
                         auth,
+                        &RetryConfig::Instance(),
                         stats,
                         progress};
         REQUIRE(runner.Process(action));
@@ -719,6 +726,7 @@ static inline void TestRetrieveOutputDirectories(
                         remote_config->platform_properties,
                         remote_config->dispatch,
                         auth,
+                        &RetryConfig::Instance(),
                         stats,
                         progress};
         REQUIRE(runner.Process(action));
@@ -792,6 +800,7 @@ static inline void TestRetrieveOutputDirectories(
                             remote_config->platform_properties,
                             remote_config->dispatch,
                             auth,
+                            &RetryConfig::Instance(),
                             stats,
                             progress};
             CHECK_FALSE(runner.Process(action));
@@ -818,6 +827,7 @@ static inline void TestRetrieveOutputDirectories(
                             remote_config->platform_properties,
                             remote_config->dispatch,
                             auth,
+                            &RetryConfig::Instance(),
                             stats,
                             progress};
             CHECK_FALSE(runner.Process(action));