Index: webrtc/pc/rtcstats_integrationtest.cc |
diff --git a/webrtc/pc/rtcstats_integrationtest.cc b/webrtc/pc/rtcstats_integrationtest.cc |
index a2bfb3ee6a8bd12b42285d02bcee0279b458e8ff..2234d6f3341ba261a3cd1db9cda626c993c09cb5 100644 |
--- a/webrtc/pc/rtcstats_integrationtest.cc |
+++ b/webrtc/pc/rtcstats_integrationtest.cc |
@@ -139,6 +139,15 @@ class RTCStatsVerifier { |
} |
template<typename T> |
+ void TestMemberIsUndefinedOrNonNegative( |
+ const RTCStatsMemberInterface& member) { |
+ if (member.is_defined()) |
+ TestMemberIsNonNegative<T>(member); |
+ else |
+ MarkMemberTested(member, true); |
+ } |
+ |
+ template<typename T> |
void TestMemberIsPositive(const RTCStatsMemberInterface& member) { |
EXPECT_TRUE(member.is_defined()) << |
stats_->type() << "." << member.name() << "[" << stats_->id() << |
@@ -387,7 +396,10 @@ class RTCStatsReportVerifier { |
} else { |
verifier.TestMemberIsUndefined(candidate_pair.available_outgoing_bitrate); |
} |
- verifier.TestMemberIsUndefined(candidate_pair.available_incoming_bitrate); |
+ // If we get an available_incoming_bitrate or not seems to depend |
+ // on test timing. |
+ verifier.TestMemberIsUndefinedOrNonNegative<double>( |
+ candidate_pair.available_incoming_bitrate); |
hbos
2017/05/02 12:58:55
Can you move this to inside "if (is_selected_pair)
hbos
2017/05/02 13:00:46
(Or perhaps "sometimes is defined" is more accurat
nisse-webrtc
2017/05/05 09:41:19
Done. Please check if the change is like you inten
|
verifier.TestMemberIsNonNegative<uint64_t>( |
candidate_pair.requests_received); |
verifier.TestMemberIsNonNegative<uint64_t>(candidate_pair.requests_sent); |