diff options
| author | Jeffrey Huang <jeffreyhuang@google.com> | 2022-04-26 13:18:19 -0700 |
|---|---|---|
| committer | Jeffrey Huang <jeffreyhuang@google.com> | 2022-05-17 17:05:29 +0000 |
| commit | c8265b804797730226bd7800a7a791a2d7df21ef (patch) | |
| tree | d4274c9a591844b7a27f43b000f858e413299ef3 | |
| parent | 8b21d16e486ed887094401bba7d1a40cf5ef8fa2 (diff) | |
| download | StatsD-c8265b804797730226bd7800a7a791a2d7df21ef.tar.gz | |
Fix invalidConfigRemoved
Many tests in statsd_test will fail if run after invalidConfigRemoved
because onConfigUpdated persists the report to disk
Bug: 230426214
Test: atest statsd_test
Change-Id: I36acb88147cef0aa56e605f81436c00821c6ab46
Merged-In: I36acb88147cef0aa56e605f81436c00821c6ab46
| -rw-r--r-- | statsd/tests/StatsLogProcessor_test.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/statsd/tests/StatsLogProcessor_test.cpp b/statsd/tests/StatsLogProcessor_test.cpp index 49218ef4..96972255 100644 --- a/statsd/tests/StatsLogProcessor_test.cpp +++ b/statsd/tests/StatsLogProcessor_test.cpp @@ -14,6 +14,7 @@ #include "StatsLogProcessor.h" +#include <android-base/stringprintf.h> #include <gmock/gmock.h> #include <gtest/gtest.h> #include <stdio.h> @@ -38,9 +39,11 @@ namespace android { namespace os { namespace statsd { +using android::base::StringPrintf; using android::util::ProtoOutputStream; #ifdef __ANDROID__ +#define STATS_DATA_DIR "/data/misc/stats-data" /** * Mock MetricsManager (ByteSize() is called). @@ -359,6 +362,8 @@ TEST(StatsLogProcessorTest, InvalidConfigRemoved) { StatsdStats::getInstance().mConfigStats.find(key)); // Both "config" and "invalidConfig" should be in the icebox. EXPECT_EQ(2, StatsdStats::getInstance().mIceBox.size()); + string suffix = StringPrintf("%d_%lld", key.GetUid(), (long long)key.GetId()); + StorageManager::deleteSuffixedFiles(STATS_DATA_DIR, suffix.c_str()); } |