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

Commit 2f4882bd authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "binderRpcTest: remove parallelization test" into main

parents 00e8bb88 68e2ee22
Loading
Loading
Loading
Loading
+7 −9
Original line number Diff line number Diff line
@@ -499,11 +499,11 @@ static void testThreadPoolOverSaturated(sp<IBinderRpcTest> iface, size_t numCall

    EXPECT_GE(epochMsAfter, epochMsBefore + 2 * sleepMs);

    // Potential flake, but make sure calls are handled in parallel. Due
    // to past flakes, this only checks that the amount of time taken has
    // some parallelism. Other tests such as ThreadPoolGreaterThanEqualRequested
    // check this more exactly.
    EXPECT_LE(epochMsAfter, epochMsBefore + (numCalls - 1) * sleepMs);
    // b/272429574, b/365294257
    // This flakes too much to test. Parallelization is tested
    // in ThreadPoolGreaterThanEqualRequested and other tests.
    // Test to make sure calls are handled in parallel.
    // EXPECT_LE(epochMsAfter, epochMsBefore + (numCalls - 1) * sleepMs);
}

TEST_P(BinderRpc, ThreadPoolOverSaturated) {
@@ -515,8 +515,7 @@ TEST_P(BinderRpc, ThreadPoolOverSaturated) {
    constexpr size_t kNumCalls = kNumThreads + 3;
    auto proc = createRpcTestSocketServerProcess({.numThreads = kNumThreads});

    // b/272429574 - below 500ms, the test fails
    testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 500 /*ms*/);
    testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 200 /*ms*/);
}

TEST_P(BinderRpc, ThreadPoolLimitOutgoing) {
@@ -530,8 +529,7 @@ TEST_P(BinderRpc, ThreadPoolLimitOutgoing) {
    auto proc = createRpcTestSocketServerProcess(
            {.numThreads = kNumThreads, .numOutgoingConnections = kNumOutgoingConnections});

    // b/272429574 - below 500ms, the test fails
    testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 500 /*ms*/);
    testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 200 /*ms*/);
}

TEST_P(BinderRpc, ThreadingStressTest) {