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

Commit b8b56174 authored by Rhed Jao's avatar Rhed Jao
Browse files

Fixes flaky ZippedBugReportStreamTest 

Dump hals tooks 4Xs in ZippedBugReportStreamTest. It resulted in
the test cannot meet the 60s criterion of the presubmit. Using the
limited only mode instead of wifi mode in the test to avoid invoking
the dump hals.

Bug: 184578081
Test: atest dumpstate_test
Change-Id: Id9fe957537b16825fa626b027a4113a42faa3670
parent ae453297

cmds/dumpstate/tests/dumpstate_test.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1032,12 +1032,12 @@ class ZippedBugReportStreamTest : public DumpstateBaseTest { 
    ZipArchiveHandle handle_;

};



// Generate a quick wifi report redirected to a file, open it and verify entry exist.

TEST_F(ZippedBugReportStreamTest, StreamWifiReport) {

    std::string out_path = kTestDataPath + "out.zip";

// Generate a quick LimitedOnly report redirected to a file, open it and verify entry exist.

TEST_F(ZippedBugReportStreamTest, StreamLimitedOnlyReport) {

    std::string out_path = kTestDataPath + "StreamLimitedOnlyReportOut.zip";

    android::base::unique_fd out_fd;

    CreateFd(out_path, &out_fd);

    ds_.options_->wifi_only = true;

    ds_.options_->limited_only = true;

    ds_.options_->stream_to_socket = true;

    RedirectOutputToFd(out_fd);
@@ -1051,7 +1051,7 @@ TEST_F(ZippedBugReportStreamTest, StreamWifiReport) { 
    ExtractToMemory(handle_, &entry, reinterpret_cast<uint8_t*>(bugreport_txt_name.data()),

                    entry.uncompressed_length);

    EXPECT_THAT(bugreport_txt_name,

                testing::ContainsRegex("(bugreport-.+-wifi(-[[:digit:]]+){6}\\.txt)"));

                testing::ContainsRegex("(bugreport-.+(-[[:digit:]]+){6}\\.txt)"));

    VerifyEntry(handle_, bugreport_txt_name, &entry);

}