Revert mCookieTagMap dump in TrafficController
aosp/2167063 moved mCookieTagMap dump from TrafficController to NetworkStatsService. But this dump was used from Cts TagSocketTest. So, this CL re-adds mCookieTagMap dump to TrafficController to avoid failure of released Cts. Upcoming CL will update Cts test to check dump both from TrafficController and NetworkStatsService. And after the old Cts support period is over, mCookieTagMap dump in TrafficController can be removed. Bug: 241787285 Test: atest TagSocketTest TrafficControllerTest Change-Id: Ie2ef09fa7d91cf96f56c5efcbe9d863dd68a1020
This commit is contained in:
@@ -791,6 +791,8 @@ TEST_F(TrafficControllerTest, TestDumpsys) {
|
||||
// ifaceIndex ifaceName tag_hex uid_int cnt_set rxBytes rxPackets txBytes txPackets
|
||||
// 999 test0 0x2a 10086 1 100 1 0 0
|
||||
std::vector<std::string> expectedLines = {
|
||||
"mCookieTagMap:",
|
||||
fmt::format("cookie={} tag={:#x} uid={}", TEST_COOKIE, TEST_TAG, TEST_UID),
|
||||
"mStatsMapA",
|
||||
"ifaceIndex ifaceName tag_hex uid_int cnt_set rxBytes rxPackets txBytes txPackets",
|
||||
fmt::format("{} {} {:#x} {} {} {} {} {} {}",
|
||||
@@ -826,6 +828,7 @@ TEST_F(TrafficControllerTest, dumpsysInvalidMaps) {
|
||||
"Read value of map -1 failed: Bad file descriptor";
|
||||
|
||||
std::vector<std::string> expectedLines = {
|
||||
fmt::format("mCookieTagMap {}", kErrIterate),
|
||||
fmt::format("mStatsMapA {}", kErrIterate),
|
||||
fmt::format("mStatsMapB {}", kErrIterate),
|
||||
fmt::format("mIfaceIndexNameMap {}", kErrIterate),
|
||||
|
||||
Reference in New Issue
Block a user