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

Commit 5ba80b01 authored by Yangster-mac's avatar Yangster-mac Committed by android-build-merger
Browse files

Merge "Fix the flaky gauge/value e2e test due to cached events." into pi-dev 

am: a1598421

Change-Id: I3942b5c691b31054ca63b3bbd7fc89ec269c9e28
parents a79cb2ad a1598421

cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) { 
        baseTimeNs, configAddedTimeNs, config, cfgKey);

    EXPECT_EQ(processor->mMetricsManagers.size(), 1u);

    EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid());

    processor->mStatsPullerManager.ForceClearPullerCache();



    int startBucketNum = processor->mMetricsManagers.begin()->second->

            mAllMetricProducers[0]->getCurrentBucketNum();
@@ -211,6 +212,7 @@ TEST(GaugeMetricE2eTest, TestAllConditionChangesSamplePulledEvents) { 
        baseTimeNs, configAddedTimeNs, config, cfgKey);

    EXPECT_EQ(processor->mMetricsManagers.size(), 1u);

    EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid());

    processor->mStatsPullerManager.ForceClearPullerCache();



    int startBucketNum = processor->mMetricsManagers.begin()->second->

            mAllMetricProducers[0]->getCurrentBucketNum();
@@ -311,6 +313,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvent_LateAlarm) { 
        baseTimeNs, configAddedTimeNs, config, cfgKey);

    EXPECT_EQ(processor->mMetricsManagers.size(), 1u);

    EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid());

    processor->mStatsPullerManager.ForceClearPullerCache();



    int startBucketNum = processor->mMetricsManagers.begin()->second->

            mAllMetricProducers[0]->getCurrentBucketNum();

cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ TEST(ValueMetricE2eTest, TestPulledEvents) { 
        baseTimeNs, configAddedTimeNs, config, cfgKey);

    EXPECT_EQ(processor->mMetricsManagers.size(), 1u);

    EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid());

    processor->mStatsPullerManager.ForceClearPullerCache();



    int startBucketNum = processor->mMetricsManagers.begin()->second->

            mAllMetricProducers[0]->getCurrentBucketNum();
@@ -172,6 +173,7 @@ TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm) { 
        baseTimeNs, configAddedTimeNs, config, cfgKey);

    EXPECT_EQ(processor->mMetricsManagers.size(), 1u);

    EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid());

    processor->mStatsPullerManager.ForceClearPullerCache();



    int startBucketNum = processor->mMetricsManagers.begin()->second->

            mAllMetricProducers[0]->getCurrentBucketNum();