Merge branch 'ign-gazebo6' into entity_system_add

chapulina · web-flow · commit f3f340bd610b · 2022-06-14T11:21:47.000-07:00
diff --git a/test/integration/sensors_system_battery.cc b/test/integration/sensors_system_battery.cc
@@ -192,8 +192,8 @@ TEST_F(SensorsFixture, IGN_UTILS_TEST_DISABLED_ON_MAC(SensorsBatteryState))
   // verify image count
   {
     std::lock_guard<std::mutex> lock(mutex);
-    EXPECT_EQ(expectedImgCount, imgCount);
-    EXPECT_EQ(expectedImgCount, depthImgCount);
+    EXPECT_NEAR(expectedImgCount, imgCount, 1);
+    EXPECT_NEAR(expectedImgCount, depthImgCount, 1);
     imgCount = 0u;
     depthImgCount = 0u;
   }

Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,8 @@ TEST_F(SensorsFixture, IGN_UTILS_TEST_DISABLED_ON_MAC(SensorsBatteryState))`
`192`	`192`	`// verify image count`
`193`	`193`	`{`
`194`	`194`	`std::lock_guard<std::mutex> lock(mutex);`
`195`		`- EXPECT_EQ(expectedImgCount, imgCount);`
`196`		`- EXPECT_EQ(expectedImgCount, depthImgCount);`
	`195`	`+ EXPECT_NEAR(expectedImgCount, imgCount, 1);`
	`196`	`+ EXPECT_NEAR(expectedImgCount, depthImgCount, 1);`
`197`	`197`	`imgCount = 0u;`
`198`	`198`	`depthImgCount = 0u;`
`199`	`199`	`}`