ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 216442e6: Merge "metricsd: Fix unit tests."

Browse source 
* commit '216442e61b667f041f35af8080c7a3625e50f122':
  metricsd: Fix unit tests.
This commit is contained in:
Bertrand Simonnet 2015-09-22 21:35:06 +00:00 • committed by Android Git Automerger
commit 5273d502b8
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
metricsd/metrics_daemon_test.cc
View file

@ -25,6 +25,7 @@
#include <base/files/scoped_temp_dir.h> #include <base/files/scoped_temp_dir.h>
#include <base/strings/string_number_conversions.h> #include <base/strings/string_number_conversions.h>
#include <base/strings/stringprintf.h> #include <base/strings/stringprintf.h>
#include <chromeos/flag_helper.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "constants.h" #include "constants.h"
@ -60,6 +61,7 @@ class MetricsDaemonTest : public testing::Test {
std::string kFakeDiskStats1; std::string kFakeDiskStats1;
virtual void SetUp() { virtual void SetUp() {
chromeos::FlagHelper::Init(0, nullptr, "");
EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
scaling_max_freq_path_ = temp_dir_.path().Append("scaling_max"); scaling_max_freq_path_ = temp_dir_.path().Append("scaling_max");
cpu_max_freq_path_ = temp_dir_.path().Append("cpu_freq_max"); cpu_max_freq_path_ = temp_dir_.path().Append("cpu_freq_max");