Skip to content

Commit

Permalink
Skip failing Windows tests (#1205)
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Perez <[email protected]>
  • Loading branch information
Blast545 authored Nov 19, 2021
1 parent adadda7 commit a06198f
Show file tree
Hide file tree
Showing 61 changed files with 454 additions and 234 deletions.
4 changes: 3 additions & 1 deletion src/Component_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <gtest/gtest.h>
#include <ignition/msgs/int32.pb.h>
#include <ignition/utilities/ExtraTestMacros.hh>

#include <memory>

Expand Down Expand Up @@ -61,7 +62,8 @@ TEST_F(ComponentTest, ComponentCanBeCopiedAfterDefaultCtor)
}

//////////////////////////////////////////////////
TEST_F(ComponentTest, DataByMove)
// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175
TEST_F(ComponentTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(DataByMove))
{
auto factory = components::Factory::Instance();

Expand Down
96 changes: 65 additions & 31 deletions src/EntityComponentManager_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <ignition/common/Util.hh>
#include <ignition/math/Pose3.hh>
#include <ignition/math/Rand.hh>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/components/Factory.hh"
#include "ignition/gazebo/components/Pose.hh"
Expand Down Expand Up @@ -172,7 +173,9 @@ TEST_P(EntityComponentManagerFixture, AdjacentMemorySingleComponentType)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, AdjacentMemoryTwoComponentTypes)
// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(AdjacentMemoryTwoComponentTypes))
{
common::setenv("IGN_DEBUG_COMPONENT_FACTORY", "true");

Expand Down Expand Up @@ -251,7 +254,8 @@ TEST_P(EntityComponentManagerFixture, InvalidComponentType)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, RemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(RemoveComponent))
{
// Create some entities
auto eInt = manager.CreateEntity();
Expand Down Expand Up @@ -418,7 +422,8 @@ TEST_P(EntityComponentManagerFixture, RemoveAddAdjacent)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EntitiesAndComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EntitiesAndComponents))
{
EXPECT_EQ(0u, manager.EntityCount());

Expand Down Expand Up @@ -490,7 +495,8 @@ TEST_P(EntityComponentManagerFixture, EntitiesAndComponents)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ComponentValues)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ComponentValues))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -656,7 +662,8 @@ TEST_P(EntityComponentManagerFixture, ComponentValues)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, RebuildViews)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(RebuildViews))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -718,7 +725,8 @@ TEST_P(EntityComponentManagerFixture, RebuildViews)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsAddComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsAddComponents))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -782,7 +790,8 @@ TEST_P(EntityComponentManagerFixture, ViewsAddComponents)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsRemoveComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsRemoveComponents))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -850,7 +859,8 @@ TEST_P(EntityComponentManagerFixture, ViewsRemoveComponents)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsAddEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsAddEntity))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -929,7 +939,8 @@ TEST_P(EntityComponentManagerFixture, ViewsAddEntity)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsRemoveEntities)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsRemoveEntities))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -1058,7 +1069,8 @@ TEST_P(EntityComponentManagerFixture, RemoveEntity)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ViewsRemoveEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ViewsRemoveEntity))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -1183,7 +1195,8 @@ int eachCount(EntityCompMgrTest &_manager)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewBasic)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewBasic))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand All @@ -1205,7 +1218,8 @@ TEST_P(EntityComponentManagerFixture, EachNewBasic)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewAfterRemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewAfterRemoveComponent))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand All @@ -1222,7 +1236,8 @@ TEST_P(EntityComponentManagerFixture, EachNewAfterRemoveComponent)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewRemoveComponentFromRemoveEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewRemoveComponentFromRemoveEntity))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand All @@ -1240,7 +1255,8 @@ TEST_P(EntityComponentManagerFixture, EachNewRemoveComponentFromRemoveEntity)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewAddComponentToExistingEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewAddComponentToExistingEntity))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand All @@ -1266,7 +1282,8 @@ TEST_P(EntityComponentManagerFixture, EachNewAddComponentToExistingEntity)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveBasic)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveBasic))
{
// Create an entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1316,7 +1333,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAlreadyRemove)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveAfterRebuild)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveAfterRebuild))
{
// Test after rebuild
Entity e1 = manager.CreateEntity();
Expand All @@ -1334,7 +1352,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAfterRebuild)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveAddComponentToRemoveEntity)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveAddComponentToRemoveEntity))
{
Entity e1 = manager.CreateEntity();
manager.CreateComponent<IntComponent>(e1, IntComponent(123));
Expand All @@ -1349,7 +1368,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAddComponentToRemoveEntity)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachRemoveAllRemove)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachRemoveAllRemove))
{
// Test when all entities are removed
Entity e1 = manager.CreateEntity();
Expand All @@ -1366,7 +1386,8 @@ TEST_P(EntityComponentManagerFixture, EachRemoveAllRemove)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachNewEachRemove)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachNewEachRemove))
{
// Test EachNew and EachRemove together
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1394,7 +1415,8 @@ TEST_P(EntityComponentManagerFixture, EachNewEachRemove)
}

////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EachGetsNewOldRemove)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EachGetsNewOldRemove))
{
// Test that an Each call gets new, old, and removed entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -1427,7 +1449,8 @@ TEST_P(EntityComponentManagerFixture, EachGetsNewOldRemove)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EntityByComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EntityByComponents))
{
// Create some entities
Entity eInt = manager.CreateEntity();
Expand Down Expand Up @@ -1492,7 +1515,8 @@ TEST_P(EntityComponentManagerFixture, EntityByComponents)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, EntityGraph)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(EntityGraph))
{
EXPECT_EQ(0u, manager.EntityCount());

Expand Down Expand Up @@ -1624,7 +1648,7 @@ TEST_P(EntityComponentManagerFixture, EntityGraph)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, State)
TEST_P(EntityComponentManagerFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(State))
{
// Entities and components
Entity e1{1};
Expand Down Expand Up @@ -1899,7 +1923,8 @@ TEST_P(EntityComponentManagerFixture, State)
}

/////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, ChangedStateComponents)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(ChangedStateComponents))
{
// Entity and component
Entity e1{1};
Expand Down Expand Up @@ -2178,7 +2203,8 @@ TEST_P(EntityComponentManagerFixture, Descendants)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, SetChanged)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SetChanged))
{
// Create entities
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2274,7 +2300,9 @@ TEST_P(EntityComponentManagerFixture, SetEntityCreateOffset)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgAfterRemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(
SerializedStateMapMsgAfterRemoveComponent))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2339,7 +2367,8 @@ TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgAfterRemoveComponent)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, SerializedStateMsgAfterRemoveComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SerializedStateMsgAfterRemoveComponent))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2400,7 +2429,8 @@ TEST_P(EntityComponentManagerFixture, SerializedStateMsgAfterRemoveComponent)
//////////////////////////////////////////////////
// Verify SerializedStateMap message with no changed components,
// but some removed components
TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgCompsRemovedOnly)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SerializedStateMapMsgCompsRemovedOnly))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2440,7 +2470,8 @@ TEST_P(EntityComponentManagerFixture, SerializedStateMapMsgCompsRemovedOnly)
//////////////////////////////////////////////////
// Verify that removed components are correctly filtered when creating a
// SerializedStateMap message
TEST_P(EntityComponentManagerFixture, SetRemovedComponentsMsgTypesFilter)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(SetRemovedComponentsMsgTypesFilter))
{
// Create entity
Entity e1 = manager.CreateEntity();
Expand Down Expand Up @@ -2478,7 +2509,9 @@ TEST_P(EntityComponentManagerFixture, SetRemovedComponentsMsgTypesFilter)
}

//////////////////////////////////////////////////
TEST_P(EntityComponentManagerFixture, RemovedComponentsSyncBetweenServerAndGUI)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(
RemovedComponentsSyncBetweenServerAndGUI))
{
// Simulate the GUI's ECM
EntityCompMgrTest guiManager;
Expand Down Expand Up @@ -2635,7 +2668,8 @@ TEST_P(EntityComponentManagerFixture, PinnedEntity)
//////////////////////////////////////////////////
/// \brief Test using msgs::SerializedStateMap and msgs::SerializedState
/// to update existing component data between multiple ECMs
TEST_P(EntityComponentManagerFixture, StateMsgUpdateComponent)
TEST_P(EntityComponentManagerFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(StateMsgUpdateComponent))
{
// create 2 ECMs: one will be modified directly, and the other should be
// updated to match the first via msgs::SerializedStateMap
Expand Down
6 changes: 4 additions & 2 deletions src/ModelCommandAPI_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <string>

#include <gtest/gtest.h>
#include <ignition/utilities/ExtraTestMacros.hh>

#include "ignition/gazebo/Server.hh"
#include "ignition/gazebo/test_config.hh" // NOLINT(build/include)
Expand Down Expand Up @@ -72,7 +73,8 @@ std::string customExecStr(std::string _cmd)

/////////////////////////////////////////////////
// Test `ign model` command when no Gazebo server is running.
TEST(ModelCommandAPI, NoServerRunning)
// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175
TEST(ModelCommandAPI, IGN_UTILS_TEST_DISABLED_ON_WIN32(NoServerRunning))
{
const std::string cmd = kIgnModelCommand + "--list ";
const std::string output = customExecStr(cmd);
Expand All @@ -85,7 +87,7 @@ TEST(ModelCommandAPI, NoServerRunning)

/////////////////////////////////////////////////
// Tests `ign model` command.
TEST(ModelCommandAPI, Commands)
TEST(ModelCommandAPI, IGN_UTILS_TEST_DISABLED_ON_WIN32(Commands))
{
ignition::gazebo::ServerConfig serverConfig;
// Using an static model to avoid any movements in the simulation.
Expand Down
5 changes: 4 additions & 1 deletion src/SdfGenerator_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <ignition/common/Console.hh>
#include <ignition/fuel_tools/ClientConfig.hh>
#include <ignition/fuel_tools/Interface.hh>
#include <ignition/utilities/ExtraTestMacros.hh>
#include <sdf/Model.hh>
#include <sdf/Root.hh>
#include <sdf/sdf.hh>
Expand Down Expand Up @@ -795,7 +796,9 @@ TEST_F(ElementUpdateFixture, WorldWithModelsExpandedWithOneIncluded)
}

/////////////////////////////////////////////////
TEST_F(ElementUpdateFixture, WorldWithModelsUsingRelativeResourceURIs)
// See https://github.com/ignitionrobotics/ign-gazebo/issues/1175
TEST_F(ElementUpdateFixture,
IGN_UTILS_TEST_DISABLED_ON_WIN32(WorldWithModelsUsingRelativeResourceURIs))
{
const auto includeUri = std::string("file://") + PROJECT_SOURCE_PATH +
"/test/worlds/models/relative_resource_uri";
Expand Down
Loading

0 comments on commit a06198f

Please sign in to comment.