Skip to content

Commit

Permalink
Fix tests that use Fuel paths with uppercase letters (gazebosim#480)
Browse files Browse the repository at this point in the history
As of gazebosim/gz-fuel-tools#130, fuel paths use all lowercase letters. This fixes some tests that had uppercase letters.
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Guillaume Doisy <[email protected]>
  • Loading branch information
azeey authored and Guillaume Doisy committed Dec 11, 2020
1 parent 1a0524f commit c25a56a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})

#--------------------------------------
# Find ignition-fuel_tools
ign_find_package(ignition-fuel_tools4 REQUIRED VERSION 4.1)
ign_find_package(ignition-fuel_tools4 REQUIRED VERSION 4.3)
set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools4_VERSION_MAJOR})

#--------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions test/integration/log_system.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1742,8 +1742,8 @@ TEST_F(LogSystemTest, LogResources)
// Recorded models should exist
EXPECT_GT(entryCount(recordPath), 2);
EXPECT_TRUE(common::exists(common::joinPaths(recordPath, homeFake,
".ignition", "fuel", "fuel.ignitionrobotics.org", "OpenRobotics",
"models", "X2 Config 1")));
".ignition", "fuel", "fuel.ignitionrobotics.org", "openrobotics",
"models", "x2 config 1")));

// Remove artifacts. Recreate new directory
this->RemoveLogsDir();
Expand Down Expand Up @@ -1777,8 +1777,8 @@ TEST_F(LogSystemTest, LogResources)
EXPECT_GT(entryCount(recordPath), 1);
#endif
EXPECT_TRUE(common::exists(common::joinPaths(recordPath, homeFake,
".ignition", "fuel", "fuel.ignitionrobotics.org", "OpenRobotics",
"models", "X2 Config 1")));
".ignition", "fuel", "fuel.ignitionrobotics.org", "openrobotics",
"models", "x2 config 1")));

// Revert environment variable after test is done
EXPECT_EQ(setenv(IGN_HOMEDIR, homeOrig.c_str(), 1), 0);
Expand Down
2 changes: 1 addition & 1 deletion test/integration/sdf_include.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ TEST(SdfInclude, DownloadFromFuel)
gazebo::Server server(serverConfig);

EXPECT_TRUE(common::exists(path +
"/fuel.ignitionrobotics.org/OpenRobotics/models/ground plane" +
"/fuel.ignitionrobotics.org/openrobotics/models/ground plane" +
"/1/model.sdf"));
}

0 comments on commit c25a56a

Please sign in to comment.