Merge pull request #320 from gazebosim/Crola1702/merge_7_to_8

port: 7 to 8 2023-01-25
gazebosim · Jan 26, 2023 · a7a206d · a7a206d
2 parents 2d25c2e + b38d5ad
commit a7a206d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -50,6 +50,11 @@
 
 ## Gazebo Fuel Tools 7.x
 
+### Gazebo Fuel Tools 7.2.0 (2021-11-17)
+
+1. Forward port 4.7.0.
+    * [Pull request #306](https://github.com/gazebosim/gz-fuel-tools/pull/306)
+
 ### Gazebo Fuel Tools 7.1.0 (2021-08-16)
 
 1. Ignition to Gazebo server rename effort

diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc
@@ -397,10 +397,10 @@ TEST_P(DownloadCollectionTest, AllItems)
       "openroboticstest", "models", "backpack")));
   EXPECT_TRUE(common::isDirectory(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openroboticstest", "models", "backpack", "2")));
+      "openroboticstest", "models", "backpack", "3")));
   EXPECT_TRUE(common::isFile(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openroboticstest", "models", "backpack", "2", "model.sdf")));
+      "openroboticstest", "models", "backpack", "3", "model.sdf")));
 
   // Model: TEAMBASE
   EXPECT_TRUE(common::isDirectory(
@@ -460,10 +460,10 @@ TEST_P(DownloadCollectionTest, Models)
       "openroboticstest", "models", "backpack")));
   EXPECT_TRUE(common::isDirectory(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openroboticstest", "models", "backpack", "2")));
+      "openroboticstest", "models", "backpack", "3")));
   EXPECT_TRUE(common::isFile(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openroboticstest", "models", "backpack", "2", "model.sdf")));
+      "openroboticstest", "models", "backpack", "3", "model.sdf")));
 
   // Model: TEAMBASE
   EXPECT_TRUE(common::isDirectory(