commit 7cfdf0cbb90612abb499bb491186a13c75c389f3
author Ghanan Gowripalan <ghanan@google.com> Fri Oct 09 06:40:44 2020 +0000
committer CQ Bot <commit-bot@chromium.org> Fri Oct 09 06:40:44 2020 +0000
tree 2c412dd0aec45d92a727de7120d23786b0b914f6
parent 3575d79840a9c57b77df470b71ed080ddea3111e

[network/tests] Stop asserting for incorrect value

...in cobalt test.

Bug: 42092

Change-Id: I59f90351c566bf648f5c87773994c0b6e370f336
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/436776
Commit-Queue: Ghanan Gowripalan <ghanan@google.com>
Reviewed-by: Tamir Duberstein <tamird@google.com>
Testability-Review: Tamir Duberstein <tamird@google.com>

src/connectivity/network/tests/src/cobalt.rs

diff --git a/src/connectivity/network/tests/src/cobalt.rs b/src/connectivity/network/tests/src/cobalt.rs
index a0262fa..3b267a5 100644
--- a/src/connectivity/network/tests/src/cobalt.rs
+++ b/src/connectivity/network/tests/src/cobalt.rs
@@ -134,11 +134,8 @@
     // TODO(fxbug.dev/43242): This is currently FIN-ACK, ACK but should be FIN-ACK, FIN-ACK.
     const EXPECTED_PACKET_COUNT: i64 = 2;
 
-    // TODO(fxbug.dev/42092): make these sent/received expected values the same.
-    // TCP payload size (12) + TCP headers (20)
-    const EXPECTED_SENT_PACKET_SIZE: i64 = 32;
     // TCP payload size (12) + TCP headers (20) + IP minimum size (20)
-    const EXPECTED_RECEIVED_PACKET_SIZE: i64 = 52;
+    const EXPECTED_PACKET_SIZE: i64 = 52;
 
     assert_eq!(
         events_with_id(&events_post_first_drop, networking_metrics::PACKETS_SENT_METRIC_ID)
@@ -158,13 +155,12 @@
         "packets received. events: {:?}",
         MultilineSlice(&events_post_first_drop),
     );
-    let res = events_with_id(&events_post_first_drop, networking_metrics::BYTES_SENT_METRIC_ID)
-        .iter()
-        .map(|ev| ev.count)
-        .max();
-    assert!(
-        res == Some(EXPECTED_PACKET_COUNT * EXPECTED_SENT_PACKET_SIZE)
-            || res == Some(EXPECTED_PACKET_COUNT * EXPECTED_RECEIVED_PACKET_SIZE),
+    assert_eq!(
+        events_with_id(&events_post_first_drop, networking_metrics::BYTES_SENT_METRIC_ID)
+            .iter()
+            .map(|ev| ev.count)
+            .max(),
+        Some(EXPECTED_PACKET_COUNT * EXPECTED_PACKET_SIZE),
         "bytes sent. events: {:?}",
         MultilineSlice(&events_post_first_drop),
     );
@@ -173,7 +169,7 @@
             .iter()
             .map(|ev| ev.count)
             .max(),
-        Some(EXPECTED_PACKET_COUNT * EXPECTED_RECEIVED_PACKET_SIZE),
+        Some(EXPECTED_PACKET_COUNT * EXPECTED_PACKET_SIZE),
         "bytes received. events: {:?}",
         MultilineSlice(&events_post_first_drop),
     );