diff --git a/test/integration/altimeter_system.cc b/test/integration/altimeter_system.cc index 2c2f1dae26..979fafc37b 100644 --- a/test/integration/altimeter_system.cc +++ b/test/integration/altimeter_system.cc @@ -60,8 +60,9 @@ void altimeterCb(const msgs::Altimeter &_msg) ///////////////////////////////////////////////// // The test checks the world pose and sensor readings of a falling altimeter -// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175 -TEST_F(AltimeterTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ModelFalling)) +// See: https://github.com/gazebosim/gz-sim/issues/1175 +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_F(AltimeterTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelFalling)) { // Start server ServerConfig serverConfig; diff --git a/test/integration/diff_drive_system.cc b/test/integration/diff_drive_system.cc index 507369ff42..51d1b5b330 100644 --- a/test/integration/diff_drive_system.cc +++ b/test/integration/diff_drive_system.cc @@ -211,8 +211,9 @@ class DiffDriveTest : public InternalFixture<::testing::TestWithParam> }; ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175 -TEST_P(DiffDriveTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(PublishCmd)) +// See: https://github.com/gazebosim/gz-sim/issues/1175 +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_P(DiffDriveTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(PublishCmd)) { TestPublishCmd( std::string(PROJECT_SOURCE_PATH) + "/test/worlds/diff_drive.sdf", @@ -220,7 +221,9 @@ TEST_P(DiffDriveTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(PublishCmd)) } ///////////////////////////////////////////////// -TEST_P(DiffDriveTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(PublishCmdCustomTopics)) +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_P(DiffDriveTest, + IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(PublishCmdCustomTopics)) { TestPublishCmd( std::string(PROJECT_SOURCE_PATH) + diff --git a/test/integration/level_manager.cc b/test/integration/level_manager.cc index 56a35e91ad..5e3466943b 100644 --- a/test/integration/level_manager.cc +++ b/test/integration/level_manager.cc @@ -179,8 +179,9 @@ class LevelManagerFixture : public InternalFixture<::testing::Test> ///////////////////////////////////////////////// /// Check default level includes entities not included by other levels -// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175 -TEST_F(LevelManagerFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(DefaultLevel)) +// See: https://github.com/gazebosim/gz-sim/issues/1175 +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_F(LevelManagerFixture, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DefaultLevel)) { std::vector> levelEntityNamesList; @@ -432,8 +433,9 @@ TEST_F(LevelManagerFixture, /////////////////////////////////////////////// /// Check that buffers work properly with multiple performers +// See: https://github.com/gazebosim/gz-sim/issues/630 TEST_F(LevelManagerFixture, - IGN_UTILS_TEST_DISABLED_ON_WIN32(LevelBuffersWithMultiplePerformers)) + IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LevelBuffersWithMultiplePerformers)) { ModelMover perf1(*this->server->EntityByName("sphere")); ModelMover perf2(*this->server->EntityByName("box")); diff --git a/test/integration/logical_audio_sensor_plugin.cc b/test/integration/logical_audio_sensor_plugin.cc index b8c8be6fba..741c7dcfb6 100644 --- a/test/integration/logical_audio_sensor_plugin.cc +++ b/test/integration/logical_audio_sensor_plugin.cc @@ -207,7 +207,9 @@ TEST_F(LogicalAudioTest, "world/logical_audio_sensor/model/source_model/sensor/source_1"); } -TEST_F(LogicalAudioTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(LogicalAudioServices)) +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_F(LogicalAudioTest, + IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LogicalAudioServices)) { ServerConfig serverConfig; const auto sdfFile = std::string(PROJECT_SOURCE_PATH) + diff --git a/test/integration/multiple_servers.cc b/test/integration/multiple_servers.cc index 05516c790b..519ee43313 100644 --- a/test/integration/multiple_servers.cc +++ b/test/integration/multiple_servers.cc @@ -17,6 +17,8 @@ #include +#include + #include "ignition/gazebo/Server.hh" #include "ignition/gazebo/ServerConfig.hh" @@ -32,7 +34,8 @@ class MultipleServers : public InternalFixture<::testing::TestWithParam> }; ///////////////////////////////////////////////// -TEST_P(MultipleServers, TwoServersNonBlocking) +// See: https://github.com/gazebosim/gz-sim/issues/1544 +TEST_P(MultipleServers, IGN_UTILS_TEST_DISABLED_ON_MAC(TwoServersNonBlocking)) { ignition::gazebo::ServerConfig serverConfig; serverConfig.SetSdfString(TestWorldSansPhysics::World()); @@ -72,7 +75,8 @@ TEST_P(MultipleServers, TwoServersNonBlocking) } ///////////////////////////////////////////////// -TEST_P(MultipleServers, TwoServersMixedBlocking) +// See: https://github.com/gazebosim/gz-sim/issues/1544 +TEST_P(MultipleServers, IGN_UTILS_TEST_DISABLED_ON_MAC(TwoServersMixedBlocking)) { ignition::gazebo::ServerConfig serverConfig; serverConfig.SetSdfString(TestWorldSansPhysics::World()); diff --git a/test/integration/network_handshake.cc b/test/integration/network_handshake.cc index 37caded521..5d35984787 100644 --- a/test/integration/network_handshake.cc +++ b/test/integration/network_handshake.cc @@ -125,7 +125,8 @@ TEST_F(NetworkHandshake, IGN_UTILS_TEST_DISABLED_ON_WIN32(Handshake)) } ///////////////////////////////////////////////// -TEST_F(NetworkHandshake, IGN_UTILS_TEST_DISABLED_ON_WIN32(Updates)) +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_F(NetworkHandshake, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Updates)) { auto pluginElem = std::make_shared(); pluginElem->SetName("plugin"); diff --git a/test/integration/performer_detector.cc b/test/integration/performer_detector.cc index 0ae453d25c..63838697cd 100644 --- a/test/integration/performer_detector.cc +++ b/test/integration/performer_detector.cc @@ -61,8 +61,10 @@ class PerformerDetectorTest : public InternalFixture<::testing::Test> ///////////////////////////////////////////////// // Test that commanded motor speed is applied -// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175 -TEST_F(PerformerDetectorTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(MovingPerformer)) +// See: https://github.com/gazebosim/gz-sim/issues/1175 +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_F(PerformerDetectorTest, + IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(MovingPerformer)) { auto server = this->StartServer("/test/worlds/performer_detector.sdf"); diff --git a/test/integration/pose_publisher_system.cc b/test/integration/pose_publisher_system.cc index ddb4f131e0..f620734a9d 100644 --- a/test/integration/pose_publisher_system.cc +++ b/test/integration/pose_publisher_system.cc @@ -322,7 +322,9 @@ TEST_F(PosePublisherTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(PublishCmd)) } ///////////////////////////////////////////////// -TEST_F(PosePublisherTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(UpdateFrequency)) +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_F(PosePublisherTest, + IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(UpdateFrequency)) { // Start server ServerConfig serverConfig; @@ -643,8 +645,9 @@ TEST_F(PosePublisherTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(StaticPosePublisher)) } ///////////////////////////////////////////////// +// See: https://github.com/gazebosim/gz-sim/issues/630 TEST_F(PosePublisherTest, - IGN_UTILS_TEST_DISABLED_ON_WIN32(StaticPoseUpdateFrequency)) + IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(StaticPoseUpdateFrequency)) { // Start server ServerConfig serverConfig; diff --git a/test/integration/touch_plugin.cc b/test/integration/touch_plugin.cc index 60813c9a8a..f1ae4745ad 100644 --- a/test/integration/touch_plugin.cc +++ b/test/integration/touch_plugin.cc @@ -187,7 +187,9 @@ TEST_F(TouchPluginTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(StartDisabled)) } ////////////////////////////////////////////////// -TEST_F(TouchPluginTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(RemovalOfParentModel)) +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_F(TouchPluginTest, + IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(RemovalOfParentModel)) { this->StartServer("/test/worlds/touch_plugin.sdf"); diff --git a/test/integration/velocity_control_system.cc b/test/integration/velocity_control_system.cc index 2ec01ae5a8..6925dbca76 100644 --- a/test/integration/velocity_control_system.cc +++ b/test/integration/velocity_control_system.cc @@ -231,8 +231,9 @@ class VelocityControlTest }; ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175 -TEST_P(VelocityControlTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(PublishCmd)) +// See: https://github.com/gazebosim/gz-sim/issues/1175 +// See: https://github.com/gazebosim/gz-sim/issues/630 +TEST_P(VelocityControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(PublishCmd)) { TestPublishCmd( std::string(PROJECT_SOURCE_PATH) + "/test/worlds/velocity_control.sdf",