Skip to content

Commit 1adbd29

Browse files
author
Cynthia Jiang
committed
Update file format
1 parent 1393f36 commit 1adbd29

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

remote_config/integration_test/src/integration_test.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,15 +353,18 @@ TEST_F(FirebaseRemoteConfigTest, TestFetchInterval) {
353353
EXPECT_TRUE(WaitForCompletion(rc_->Activate(), "Activate"));
354354
uint64_t current_fetch_time = rc_->GetInfo().fetch_time;
355355
// Making sure the config settings's fetch interval is 12 hours
356-
EXPECT_TRUE(WaitForCompletion(SetDefaultConfigSettings(rc_), "SetDefaultConfigSettings"));
356+
EXPECT_TRUE(WaitForCompletion(SetDefaultConfigSettings(rc_),
357+
"SetDefaultConfigSettings"));
357358
// Second fetch, should respect fetch interval and don't change data.
358359
EXPECT_TRUE(WaitForCompletion(
359360
RunWithRetry([](RemoteConfig* rc) { return rc->Fetch(); }, rc_),
360361
"Fetch"));
361362
EXPECT_EQ(current_fetch_time, rc_->GetInfo().fetch_time);
362363
// Update fetch interval to 0
363-
EXPECT_TRUE(WaitForCompletion(SetZeroIntervalConfigSettings(rc_), "SetZeroIntervalConfigSettings"));
364-
LogDebug("Current Fetch Interval: %lld", rc_->GetConfigSettings().minimum_fetch_interval_in_milliseconds);
364+
EXPECT_TRUE(WaitForCompletion(SetZeroIntervalConfigSettings(rc_),
365+
"SetZeroIntervalConfigSettings"));
366+
LogDebug("Current Fetch Interval: %lld",
367+
rc_->GetConfigSettings().minimum_fetch_interval_in_milliseconds);
365368
// Third fetch, this should operate the real fetch and update the fetch time.
366369
EXPECT_TRUE(WaitForCompletion(
367370
RunWithRetry([](RemoteConfig* rc) { return rc->Fetch(); }, rc_),

remote_config/src/desktop/remote_config_desktop.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ Future<bool> RemoteConfigInternal::FetchAndActivate() {
139139
const auto future_handle =
140140
future_impl_.SafeAlloc<bool>(kRemoteConfigFnFetchAndActivate);
141141

142-
cache_expiration_in_seconds_ = config_settings_.minimum_fetch_interval_in_milliseconds;
142+
cache_expiration_in_seconds_ =
143+
config_settings_.minimum_fetch_interval_in_milliseconds;
143144

144145
uint64_t milliseconds_since_epoch =
145146
std::chrono::duration_cast<std::chrono::milliseconds>(

remote_config/src/remote_config.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ Future<bool> RemoteConfig::FetchAndActivateLastResult() {
131131
return internal_->FetchAndActivateLastResult();
132132
}
133133

134-
Future<void> RemoteConfig::Fetch() { return Fetch(GetConfigSettings().minimum_fetch_interval_in_milliseconds); }
134+
Future<void> RemoteConfig::Fetch() {
135+
return Fetch(GetConfigSettings().minimum_fetch_interval_in_milliseconds);
136+
}
135137

136138
Future<void> RemoteConfig::Fetch(uint64_t cache_expiration_in_seconds) {
137139
return internal_->Fetch(cache_expiration_in_seconds);

0 commit comments

Comments
 (0)