Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable MacOS flakies Citadel #1545

Merged
merged 7 commits into from
Jun 23, 2022
Merged

Disable MacOS flakies Citadel #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3034b31
Disable PeerTracker.PeerTrackerStale on macOS (#1398)
azeey Mar 18, 2022
6ea655e
Disable flaky test on Mac
Blast545 Jun 20, 2022
846b2dd
Disable flaky test on MacOS
Blast545 Jun 20, 2022
3c119a3
Fix linter
Blast545 Jun 20, 2022
77dc77b
Include extra macros
Blast545 Jun 20, 2022
b7910c5
Add extra macro
Blast545 Jun 20, 2022
58514b6
Use macro as in Citadel
Blast545 Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Server_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <ignition/common/Util.hh>
#include <ignition/math/Rand.hh>
#include <ignition/transport/Node.hh>
#include <ignition/utilities/ExtraTestMacros.hh>
#include <sdf/Mesh.hh>

#include "ignition/gazebo/components/AxisAlignedBox.hh"
Expand Down Expand Up @@ -678,7 +679,8 @@ TEST_P(ServerFixture, ServerControlStop)
}

/////////////////////////////////////////////////
TEST_P(ServerFixture, TwoServersNonBlocking)
// See: https://github.com/gazebosim/gz-sim/issues/1544
TEST_P(ServerFixture, IGN_UTILS_TEST_DISABLED_ON_MAC(TwoServersNonBlocking))
{
ignition::gazebo::ServerConfig serverConfig;
serverConfig.SetSdfString(TestWorldSansPhysics::World());
Expand Down Expand Up @@ -718,7 +720,8 @@ TEST_P(ServerFixture, TwoServersNonBlocking)
}

/////////////////////////////////////////////////
TEST_P(ServerFixture, TwoServersMixedBlocking)
// See: https://github.com/gazebosim/gz-sim/issues/1544
TEST_P(ServerFixture, IGN_UTILS_TEST_DISABLED_ON_MAC(TwoServersMixedBlocking))
{
ignition::gazebo::ServerConfig serverConfig;
serverConfig.SetSdfString(TestWorldSansPhysics::World());
Expand Down
3 changes: 2 additions & 1 deletion src/network/PeerTracker_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <cstdlib>
#include <ignition/common/Console.hh>
#include <ignition/common/Util.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "PeerTracker.hh"
#include "ignition/gazebo/EventManager.hh"
Expand Down Expand Up @@ -143,7 +144,7 @@ TEST(PeerTracker, PeerTracker)
}

//////////////////////////////////////////////////
TEST(PeerTracker, PeerTrackerStale)
TEST(PeerTracker, IGN_UTILS_TEST_DISABLED_ON_MAC(PeerTrackerStale))
{
ignition::common::Console::SetVerbosity(4);
EventManager eventMgr;
Expand Down
4 changes: 3 additions & 1 deletion test/integration/altimeter_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <ignition/common/Util.hh>
#include <ignition/math/Pose3.hh>
#include <ignition/transport/Node.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/components/Altimeter.hh"
#include "ignition/gazebo/components/LinearVelocity.hh"
Expand Down Expand Up @@ -59,7 +60,8 @@ void altimeterCb(const msgs::Altimeter &_msg)

/////////////////////////////////////////////////
// The test checks the world pose and sensor readings of a falling altimeter
TEST_F(AltimeterTest, ModelFalling)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(AltimeterTest, IGN_UTILS_TEST_DISABLED_ON_MAC(ModelFalling))
{
// Start server
ServerConfig serverConfig;
Expand Down
7 changes: 5 additions & 2 deletions test/integration/diff_drive_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <ignition/common/Util.hh>
#include <ignition/math/Pose3.hh>
#include <ignition/transport/Node.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/components/Name.hh"
#include "ignition/gazebo/components/Model.hh"
Expand Down Expand Up @@ -210,15 +211,17 @@ class DiffDriveTest : public InternalFixture<::testing::TestWithParam<int>>
};

/////////////////////////////////////////////////
TEST_P(DiffDriveTest, PublishCmd)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_P(DiffDriveTest, IGN_UTILS_TEST_DISABLED_ON_MAC(PublishCmd))
{
TestPublishCmd(
std::string(PROJECT_SOURCE_PATH) + "/test/worlds/diff_drive.sdf",
"/model/vehicle/cmd_vel", "/model/vehicle/odometry");
}

/////////////////////////////////////////////////
TEST_P(DiffDriveTest, PublishCmdCustomTopics)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_P(DiffDriveTest, IGN_UTILS_TEST_DISABLED_ON_MAC(PublishCmdCustomTopics))
{
TestPublishCmd(
std::string(PROJECT_SOURCE_PATH) +
Expand Down
8 changes: 6 additions & 2 deletions test/integration/level_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include <ignition/common/Console.hh>
#include <ignition/common/Util.hh>
#include <ignition/utilities/ExtraTestMacros.hh>
#include <sdf/Box.hh>
#include <sdf/Cylinder.hh>
#include <sdf/Joint.hh>
Expand Down Expand Up @@ -178,7 +179,8 @@ class LevelManagerFixture : public InternalFixture<::testing::Test>

/////////////////////////////////////////////////
/// Check default level includes entities not included by other levels
TEST_F(LevelManagerFixture, DefaultLevel)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(LevelManagerFixture, IGN_UTILS_TEST_DISABLED_ON_MAC(DefaultLevel))
{
std::vector<std::set<std::string>> levelEntityNamesList;

Expand Down Expand Up @@ -429,7 +431,9 @@ TEST_F(LevelManagerFixture, LevelsWithMultiplePerformers)

///////////////////////////////////////////////
/// Check that buffers work properly with multiple performers
TEST_F(LevelManagerFixture, LevelBuffersWithMultiplePerformers)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(LevelManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_MAC(LevelBuffersWithMultiplePerformers))
{
ModelMover perf1(*this->server->EntityByName("sphere"));
ModelMover perf2(*this->server->EntityByName("box"));
Expand Down
4 changes: 3 additions & 1 deletion test/integration/logical_audio_sensor_plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <ignition/math/Pose3.hh>
#include <ignition/msgs.hh>
#include <ignition/transport.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/components/LogicalAudio.hh"
#include "ignition/gazebo/components/Pose.hh"
Expand Down Expand Up @@ -204,7 +205,8 @@ TEST_F(LogicalAudioTest, LogicalAudioDetections)
"world/logical_audio_sensor/model/source_model/sensor/source_1");
}

TEST_F(LogicalAudioTest, LogicalAudioServices)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(LogicalAudioTest, IGN_UTILS_TEST_DISABLED_ON_MAC(LogicalAudioServices))
{
ServerConfig serverConfig;
const auto sdfFile = std::string(PROJECT_SOURCE_PATH) +
Expand Down
4 changes: 3 additions & 1 deletion test/integration/network_handshake.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <gtest/gtest.h>
#include <chrono>
#include <condition_variable>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/msgs/world_control.pb.h"
#include "ignition/msgs/world_stats.pb.h"
Expand Down Expand Up @@ -122,7 +123,8 @@ TEST_F(NetworkHandshake, Handshake)
}

/////////////////////////////////////////////////
TEST_F(NetworkHandshake, Updates)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(NetworkHandshake, IGN_UTILS_TEST_DISABLED_ON_MAC(Updates))
{
auto pluginElem = std::make_shared<sdf::Element>();
pluginElem->SetName("plugin");
Expand Down
4 changes: 3 additions & 1 deletion test/integration/performer_detector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <ignition/msgs/pose.pb.h>

#include <ignition/transport/Node.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/Server.hh"
#include "ignition/gazebo/SystemLoader.hh"
Expand Down Expand Up @@ -60,7 +61,8 @@ class PerformerDetectorTest : public InternalFixture<::testing::Test>

/////////////////////////////////////////////////
// Test that commanded motor speed is applied
TEST_F(PerformerDetectorTest, MovingPerformer)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(PerformerDetectorTest, IGN_UTILS_TEST_DISABLED_ON_MAC(MovingPerformer))
{
auto server = this->StartServer("/test/worlds/performer_detector.sdf");

Expand Down
8 changes: 6 additions & 2 deletions test/integration/pose_publisher_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <ignition/common/Util.hh>
#include <ignition/math/Pose3.hh>
#include <ignition/transport/Node.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/components/Name.hh"
#include "ignition/gazebo/components/Model.hh"
Expand Down Expand Up @@ -309,7 +310,8 @@ TEST_F(PosePublisherTest, PublishCmd)
}

/////////////////////////////////////////////////
TEST_F(PosePublisherTest, UpdateFrequency)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(PosePublisherTest, IGN_UTILS_TEST_DISABLED_ON_MAC(UpdateFrequency))
{
// Start server
ServerConfig serverConfig;
Expand Down Expand Up @@ -626,7 +628,9 @@ TEST_F(PosePublisherTest, StaticPosePublisher)
}

/////////////////////////////////////////////////
TEST_F(PosePublisherTest, StaticPoseUpdateFrequency)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(PosePublisherTest,
IGN_UTILS_TEST_DISABLED_ON_MAC(StaticPoseUpdateFrequency))
{
// Start server
ServerConfig serverConfig;
Expand Down
4 changes: 3 additions & 1 deletion test/integration/touch_plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <ignition/common/Console.hh>
#include <ignition/common/Util.hh>
#include <ignition/transport/Node.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/Server.hh"
#include "ignition/gazebo/test_config.hh"
Expand Down Expand Up @@ -185,7 +186,8 @@ TEST_F(TouchPluginTest, StartDisabled)
}

//////////////////////////////////////////////////
TEST_F(TouchPluginTest, RemovalOfParentModel)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_F(TouchPluginTest, IGN_UTILS_TEST_DISABLED_ON_MAC(RemovalOfParentModel))
{
this->StartServer("/test/worlds/touch_plugin.sdf");

Expand Down
4 changes: 3 additions & 1 deletion test/integration/velocity_control_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <ignition/common/Util.hh>
#include <ignition/math/Pose3.hh>
#include <ignition/transport/Node.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/components/Link.hh"
#include "ignition/gazebo/components/Name.hh"
Expand Down Expand Up @@ -230,7 +231,8 @@ class VelocityControlTest
};

/////////////////////////////////////////////////
TEST_P(VelocityControlTest, PublishCmd)
// See: https://github.com/gazebosim/gz-sim/issues/630
TEST_P(VelocityControlTest, IGN_UTILS_TEST_DISABLED_ON_MAC(PublishCmd))
{
TestPublishCmd(
std::string(PROJECT_SOURCE_PATH) + "/test/worlds/velocity_control.sdf",
Expand Down