mirror of
https://github.com/facebookincubator/mvfst.git
synced 2026-01-06 03:41:10 +03:00
Back out "Revert D17636918: [quic] Create findFrameInPacketFunc helper function for unit tests"
Summary: Original commit changeset: dcc2b618c2a7 Reviewed By: lnicco Differential Revision: D17688819 fbshipit-source-id: 9dd3dbcfd78549f5858a41b67db7fc4bc0647469
This commit is contained in:
committed by
Facebook Github Bot
parent
7ca3482f1d
commit
56c18e96ef
@@ -1585,22 +1585,8 @@ TEST_F(QuicServerTransportTest, TestCloneStopSending) {
|
||||
auto packetItr = std::find_if(
|
||||
server->getNonConstConn().outstandingPackets.begin(),
|
||||
server->getNonConstConn().outstandingPackets.end(),
|
||||
[&](auto& p) {
|
||||
return std::find_if(
|
||||
p.packet.frames.begin(),
|
||||
p.packet.frames.end(),
|
||||
[&](auto& f) {
|
||||
return folly::variant_match(
|
||||
f,
|
||||
[&](QuicSimpleFrame& s) {
|
||||
return folly::variant_match(
|
||||
s,
|
||||
[&](StopSendingFrame&) { return true; },
|
||||
[&](auto&) { return false; });
|
||||
},
|
||||
[&](auto&) { return false; });
|
||||
}) != p.packet.frames.end();
|
||||
});
|
||||
findFrameInPacketFunc<StopSendingFrame>());
|
||||
|
||||
ASSERT_TRUE(packetItr != server->getNonConstConn().outstandingPackets.end());
|
||||
// Force a timeout with no data so that it clones the packet
|
||||
server->lossTimeout().timeoutExpired();
|
||||
@@ -1608,22 +1594,8 @@ TEST_F(QuicServerTransportTest, TestCloneStopSending) {
|
||||
auto numStopSendingPackets = std::count_if(
|
||||
server->getNonConstConn().outstandingPackets.begin(),
|
||||
server->getNonConstConn().outstandingPackets.end(),
|
||||
[&](auto& p) {
|
||||
return std::find_if(
|
||||
p.packet.frames.begin(),
|
||||
p.packet.frames.end(),
|
||||
[&](auto& f) {
|
||||
return folly::variant_match(
|
||||
f,
|
||||
[&](QuicSimpleFrame& s) {
|
||||
return folly::variant_match(
|
||||
s,
|
||||
[&](StopSendingFrame&) { return true; },
|
||||
[&](auto&) { return false; });
|
||||
},
|
||||
[&](auto&) { return false; });
|
||||
}) != p.packet.frames.end();
|
||||
});
|
||||
findFrameInPacketFunc<StopSendingFrame>());
|
||||
|
||||
EXPECT_GT(numStopSendingPackets, 1);
|
||||
|
||||
std::vector<int> indices =
|
||||
@@ -1639,22 +1611,8 @@ TEST_F(QuicServerTransportTest, TestAckStopSending) {
|
||||
server->getNonConstConn().streamManager->getStream(streamId);
|
||||
server->stopSending(streamId, GenericApplicationErrorCode::UNKNOWN);
|
||||
loopForWrites();
|
||||
auto match = [](OutstandingPacket& packet) {
|
||||
return std::find_if(
|
||||
packet.packet.frames.begin(),
|
||||
packet.packet.frames.end(),
|
||||
[&](auto& f) {
|
||||
return folly::variant_match(
|
||||
f,
|
||||
[&](QuicSimpleFrame& s) {
|
||||
return folly::variant_match(
|
||||
s,
|
||||
[&](StopSendingFrame&) { return true; },
|
||||
[&](auto&) { return false; });
|
||||
},
|
||||
[&](auto&) { return false; });
|
||||
}) != packet.packet.frames.end();
|
||||
};
|
||||
auto match = findFrameInPacketFunc<StopSendingFrame>();
|
||||
|
||||
auto op = findOutstandingPacket(server->getNonConstConn(), match);
|
||||
ASSERT_TRUE(op != nullptr);
|
||||
PacketNum packetNum = op->packet.header.getPacketSequenceNum();
|
||||
|
||||
Reference in New Issue
Block a user