Skip to content

Commit

Permalink
Disable tests that are known to fail on Windows (#387)
Browse files Browse the repository at this point in the history
Windows doesn't support colon or at-symbol in paths.
This disables the tests on gz-fuel-tools8, as we want to preserve the
behavior (to not invalidate anyone's current cache).  On gz-fuel-tools9
forward, the fix is implemented.

Do not forward port these changes

Signed-off-by: Michael Carroll <[email protected]>
  • Loading branch information
mjcarroll authored Nov 27, 2023
1 parent 880f966 commit ed334c9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/FuelClient_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,8 @@ TEST_F(FuelClientTest, DownloadWorld)
/////////////////////////////////////////////////
// Windows doesn't support colons in filenames
// https://github.com/gazebosim/gz-fuel-tools/issues/106
TEST_F(FuelClientTest, CachedWorld)
// This is fixed in gz-fuel-tools9+, but not here to preserve behavior
TEST_F(FuelClientTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(CachedWorld))
{
ClientConfig config;
config.SetCacheLocation(common::joinPaths(common::cwd(), "test_cache"));
Expand Down Expand Up @@ -1477,8 +1478,11 @@ TEST_F(FuelClientTest, UploadModelFail)
EXPECT_EQ(ResultType::UPLOAD_ERROR, result.Type());
}

//////////////////////////////////////////////////
TEST_F(FuelClientTest, PatchModelFail)
/////////////////////////////////////////////////
// Windows doesn't support colons in filenames
// https://github.com/gazebosim/gz-fuel-tools/issues/106
// This is fixed in gz-fuel-tools9+, but not here to preserve behavior
TEST_F(FuelClientTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(PatchModelFail))
{
FuelClient client;
ModelIdentifier modelId;
Expand Down
4 changes: 4 additions & 0 deletions src/gz_src_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ class CmdLine : public ::testing::Test
// instead of on teardown leaves the folder intact for debugging if needed
common::removeAll(testCachePath);
ASSERT_TRUE(common::createDirectories(testCachePath));
ASSERT_TRUE(common::createDirectories(
common::joinPaths(testCachePath, "fuel.gazebosim.org")));
ASSERT_TRUE(common::createDirectories(
common::joinPaths(testCachePath, "fuel.ignitionrobotics.org")));
setenv("GZ_FUEL_CACHE_PATH", this->testCachePath.c_str(), true);
}

Expand Down

0 comments on commit ed334c9

Please sign in to comment.