commit 3dce7eae3857489bb13b3874d1f4934e5000823c
author Stephan Pleines <stephan.pleines@bluerivertech.com> Tue Jun 22 13:19:26 2021 -0700
committer Austin Schuh <austin.schuh@bluerivertech.com> Tue Oct 12 18:12:49 2021 -0700
tree 20f4432b1f491b2ae8e0200b2e2d848b05954987
parent 3926f99acc23574967a495a9aef52d2598f6a2a7

Replace EXPECT with ASSERT to avoid container-overflow asan failure

The one in line 1084 is the one that was part of the nightly
failure, the others I added after scanning the file.

1084:  If the size is less than 7 then we get an asan failure
when trying to access elements that don't exist.  The root cause
is not an asan failure though, but a non-deterministic test.
Finding the root cause is beyond me, this change does not address
the root cause.

Change-Id: Ia9fadfaa03636a9c0d49247f7324301aeebc9aac
Signed-off-by: Austin Schuh <austin.schuh@bluerivertech.com>

aos/events/event_loop_param_test.cc

diff --git a/aos/events/event_loop_param_test.cc b/aos/events/event_loop_param_test.cc
index 4a298f0..77a3d09 100644
--- a/aos/events/event_loop_param_test.cc
+++ b/aos/events/event_loop_param_test.cc
@@ -937,7 +937,7 @@
 
 // Verify that timer intervals and duration function properly.
 TEST_P(AbstractEventLoopTest, TimerIntervalAndDuration) {
-  // Force a slower rate so we are guarenteed to have reports for our timer.
+  // Force a slower rate so we are guaranteed to have reports for our timer.
   FLAGS_timing_report_ms = 2000;
 
   const int kCount = 5;
@@ -977,9 +977,9 @@
   Run();
 
   // Confirm that we got both the right number of samples, and it's odd.
-  EXPECT_EQ(times.size(), static_cast<size_t>(kCount));
-  EXPECT_EQ(times.size(), expected_times.size());
-  EXPECT_EQ((times.size() % 2), 1);
+  ASSERT_EQ(times.size(), static_cast<size_t>(kCount));
+  ASSERT_EQ(times.size(), expected_times.size());
+  ASSERT_EQ((times.size() % 2), 1);
 
   // Grab the middle sample.
   ::aos::monotonic_clock::time_point average_time = times[times.size() / 2];
@@ -1179,7 +1179,7 @@
 }
 
 // Verifies that the event loop implementations detect when Channel is not a
-// pointer into confguration()
+// pointer into configuration()
 TEST_P(AbstractEventLoopDeathTest, InvalidChannel) {
   auto loop = MakePrimary();
 
@@ -1421,7 +1421,7 @@
 // Tests that a couple phased loops run in a row result in the correct offset
 // and period.
 TEST_P(AbstractEventLoopTest, PhasedLoopTest) {
-  // Force a slower rate so we are guarenteed to have reports for our phased
+  // Force a slower rate so we are guaranteed to have reports for our phased
   // loop.
   FLAGS_timing_report_ms = 2000;
 
@@ -1474,9 +1474,9 @@
   Run();
 
   // Confirm that we got both the right number of samples, and it's odd.
-  EXPECT_EQ(times.size(), static_cast<size_t>(kCount));
-  EXPECT_EQ(times.size(), expected_times.size());
-  EXPECT_EQ((times.size() % 2), 1);
+  ASSERT_EQ(times.size(), static_cast<size_t>(kCount));
+  ASSERT_EQ(times.size(), expected_times.size());
+  ASSERT_EQ((times.size() % 2), 1);
 
   // Grab the middle sample.
   ::aos::monotonic_clock::time_point average_time = times[times.size() / 2];