Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 659f5ade authored by Bertrand Simonnet's avatar Bertrand Simonnet Committed by Gerrit Code Review
Browse files

Merge "metricsd: Fix race condition in the tests."

parents 7f16425d 3598d951

metricsd/include/metrics/metrics_library.h

+2 −2
Original line number Diff line number Diff line
@@ -142,10 +142,10 @@ class MetricsLibrary : public MetricsLibraryInterface { 
                       bool* result);



  // Time at which we last checked if metrics were enabled.

  static time_t cached_enabled_time_;

  time_t cached_enabled_time_;



  // Cached state of whether or not metrics were enabled.

  static bool cached_enabled_;

  bool cached_enabled_;



  base::FilePath uma_events_file_;

  base::FilePath consent_file_;

metricsd/metrics_library.cc

+4 −3
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ static const char *kCrosEventNames[] = { 
  "TPM.EarlyResetDuringCommand",  // 12

};



time_t MetricsLibrary::cached_enabled_time_ = 0;

bool MetricsLibrary::cached_enabled_ = false;



MetricsLibrary::MetricsLibrary() {}

MetricsLibrary::~MetricsLibrary() {}
@@ -140,11 +137,15 @@ void MetricsLibrary::Init() { 
  base::FilePath dir = base::FilePath(metrics::kMetricsDirectory);

  uma_events_file_ = dir.Append(metrics::kMetricsEventsFileName);

  consent_file_ = dir.Append(metrics::kConsentFileName);

  cached_enabled_ = false;

  cached_enabled_time_ = 0;

}



void MetricsLibrary::InitForTest(const base::FilePath& metrics_directory) {

  uma_events_file_ = metrics_directory.Append(metrics::kMetricsEventsFileName);

  consent_file_ = metrics_directory.Append(metrics::kConsentFileName);

  cached_enabled_ = false;

  cached_enabled_time_ = 0;

}



bool MetricsLibrary::SendToUMA(const std::string& name,

metricsd/uploader/upload_service_test.cc

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ class UploadServiceTest : public testing::Test { 
    chromeos_metrics::PersistentInteger::SetMetricsDirectory(

        dir_.path().value());

    metrics_lib_.InitForTest(dir_.path());

    ASSERT_EQ(0, base::WriteFile(

        dir_.path().Append(metrics::kConsentFileName), "", 0));

    upload_service_.reset(new UploadService(new MockSystemProfileSetter(),

                                            &metrics_lib_, "", true));