Commit 7b801e0b authored by Joshua Pawlicki's avatar Joshua Pawlicki Committed by Commit Bot

Shorten time to first component update check.

Bug: 1020330
Change-Id: Ia6aa7442290c5af37c56e387c17cd609ed6467b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894265
Auto-Submit: Joshua Pawlicki <waffles@chromium.org>
Reviewed-by: default avatarSorin Jianu <sorin@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711682}
parent 51597584
...@@ -57,7 +57,7 @@ ConfiguratorImpl::~ConfiguratorImpl() {} ...@@ -57,7 +57,7 @@ ConfiguratorImpl::~ConfiguratorImpl() {}
int ConfiguratorImpl::InitialDelay() const { int ConfiguratorImpl::InitialDelay() const {
if (initial_delay_) if (initial_delay_)
return initial_delay_; return initial_delay_;
return fast_update_ ? 10 : (6 * kDelayOneMinute); return fast_update_ ? 10 : kDelayOneMinute;
} }
int ConfiguratorImpl::NextCheckDelay() const { int ConfiguratorImpl::NextCheckDelay() const {
......
...@@ -33,7 +33,7 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, FastUpdate) { ...@@ -33,7 +33,7 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, FastUpdate) {
base::CommandLine cmdline(base::CommandLine::NO_PROGRAM); base::CommandLine cmdline(base::CommandLine::NO_PROGRAM);
std::unique_ptr<ConfiguratorImpl> config = std::make_unique<ConfiguratorImpl>( std::unique_ptr<ConfiguratorImpl> config = std::make_unique<ConfiguratorImpl>(
ComponentUpdaterCommandLineConfigPolicy(&cmdline), false); ComponentUpdaterCommandLineConfigPolicy(&cmdline), false);
CHECK_EQ(6 * kDelayOneMinute, config->InitialDelay()); CHECK_EQ(kDelayOneMinute, config->InitialDelay());
CHECK_EQ(5 * kDelayOneHour, config->NextCheckDelay()); CHECK_EQ(5 * kDelayOneHour, config->NextCheckDelay());
CHECK_EQ(30 * kDelayOneMinute, config->OnDemandDelay()); CHECK_EQ(30 * kDelayOneMinute, config->OnDemandDelay());
CHECK_EQ(15 * kDelayOneMinute, config->UpdateDelay()); CHECK_EQ(15 * kDelayOneMinute, config->UpdateDelay());
...@@ -67,7 +67,7 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, FastUpdateWithCustomPolicy) { ...@@ -67,7 +67,7 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, FastUpdateWithCustomPolicy) {
std::unique_ptr<ConfiguratorImpl> config = std::make_unique<ConfiguratorImpl>( std::unique_ptr<ConfiguratorImpl> config = std::make_unique<ConfiguratorImpl>(
DefaultCommandLineConfigPolicy(), false); DefaultCommandLineConfigPolicy(), false);
CHECK_EQ(6 * kDelayOneMinute, config->InitialDelay()); CHECK_EQ(kDelayOneMinute, config->InitialDelay());
CHECK_EQ(5 * kDelayOneHour, config->NextCheckDelay()); CHECK_EQ(5 * kDelayOneHour, config->NextCheckDelay());
CHECK_EQ(30 * kDelayOneMinute, config->OnDemandDelay()); CHECK_EQ(30 * kDelayOneMinute, config->OnDemandDelay());
CHECK_EQ(15 * kDelayOneMinute, config->UpdateDelay()); CHECK_EQ(15 * kDelayOneMinute, config->UpdateDelay());
...@@ -91,7 +91,7 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, FastUpdateWithCustomPolicy) { ...@@ -91,7 +91,7 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, FastUpdateWithCustomPolicy) {
TEST_F(ComponentUpdaterConfiguratorImplTest, InitialDelay) { TEST_F(ComponentUpdaterConfiguratorImplTest, InitialDelay) {
std::unique_ptr<ConfiguratorImpl> config = std::make_unique<ConfiguratorImpl>( std::unique_ptr<ConfiguratorImpl> config = std::make_unique<ConfiguratorImpl>(
update_client::CommandLineConfigPolicy(), false); update_client::CommandLineConfigPolicy(), false);
CHECK_EQ(6 * kDelayOneMinute, config->InitialDelay()); CHECK_EQ(kDelayOneMinute, config->InitialDelay());
class CommandLineConfigPolicy class CommandLineConfigPolicy
: public update_client::CommandLineConfigPolicy { : public update_client::CommandLineConfigPolicy {
...@@ -128,14 +128,14 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, InitialDelay) { ...@@ -128,14 +128,14 @@ TEST_F(ComponentUpdaterConfiguratorImplTest, InitialDelay) {
CommandLineConfigPolicy clcp; CommandLineConfigPolicy clcp;
clcp.set_fast_update(false); clcp.set_fast_update(false);
config = std::make_unique<ConfiguratorImpl>(clcp, false); config = std::make_unique<ConfiguratorImpl>(clcp, false);
CHECK_EQ(6 * kDelayOneMinute, config->InitialDelay()); CHECK_EQ(kDelayOneMinute, config->InitialDelay());
} }
{ {
CommandLineConfigPolicy clcp; CommandLineConfigPolicy clcp;
clcp.set_initial_delay(kDelayOneMinute); clcp.set_initial_delay(2 * kDelayOneMinute);
config = std::make_unique<ConfiguratorImpl>(clcp, false); config = std::make_unique<ConfiguratorImpl>(clcp, false);
CHECK_EQ(kDelayOneMinute, config->InitialDelay()); CHECK_EQ(2 * kDelayOneMinute, config->InitialDelay());
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment