Commit 21b48bfc authored by Kalvin Lee's avatar Kalvin Lee Committed by Commit Bot

PpdProvider v3: add time-sensitive tests

This change
* fixes some bugs in the way the PpdMetadataManager deals with
  cache expiration and
* adds unit tests to enforce the advertised conventions.

Bug: chromium:888189
Test: chromeos_unittests --gtest_filter='PpdMetadataManagerTest.*'
Change-Id: I6254fae91a158c93734930ba941d7b0404b8d115
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2332037Reviewed-by: default avatarLuum Habtemariam <luum@chromium.org>
Commit-Queue: Kalvin Lee <kdlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796056}
parent aaf07d2f
...@@ -351,7 +351,7 @@ class PpdMetadataManagerImpl : public PpdMetadataManager { ...@@ -351,7 +351,7 @@ class PpdMetadataManagerImpl : public PpdMetadataManager {
const std::string metadata_name = PpdMetadataPathInServingRoot(options); const std::string metadata_name = PpdMetadataPathInServingRoot(options);
if (MapHasValueFresherThan(cached_manufacturers_, metadata_name, if (MapHasValueFresherThan(cached_manufacturers_, metadata_name,
clock_->Now() + age)) { clock_->Now() - age)) {
OnManufacturersAvailable(metadata_name, std::move(cb)); OnManufacturersAvailable(metadata_name, std::move(cb));
return; return;
} }
...@@ -376,7 +376,7 @@ class PpdMetadataManagerImpl : public PpdMetadataManager { ...@@ -376,7 +376,7 @@ class PpdMetadataManagerImpl : public PpdMetadataManager {
} }
if (MapHasValueFresherThan(cached_printers_, metadata_name.value(), if (MapHasValueFresherThan(cached_printers_, metadata_name.value(),
clock_->Now() + age)) { clock_->Now() - age)) {
OnPrintersAvailable(metadata_name.value(), std::move(cb)); OnPrintersAvailable(metadata_name.value(), std::move(cb));
return; return;
} }
...@@ -400,7 +400,7 @@ class PpdMetadataManagerImpl : public PpdMetadataManager { ...@@ -400,7 +400,7 @@ class PpdMetadataManagerImpl : public PpdMetadataManager {
PpdMetadataPathInServingRoot(reverse_index_options); PpdMetadataPathInServingRoot(reverse_index_options);
if (MapHasValueFresherThan(cached_reverse_indices_, metadata_name, if (MapHasValueFresherThan(cached_reverse_indices_, metadata_name,
clock_->Now() + age)) { clock_->Now() - age)) {
OnReverseIndexAvailable(metadata_name, effective_make_and_model, OnReverseIndexAvailable(metadata_name, effective_make_and_model,
std::move(cb)); std::move(cb));
return; return;
......
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