Merge 24b3c1c into e655d40

gazebosim · Aug 18, 2023 · a091613 · a091613
2 parents e655d40 + 24b3c1c
commit a091613
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/test/integration/marker_manager.cc b/test/integration/marker_manager.cc
@@ -211,4 +211,7 @@ TEST_F(MarkerManagerTestFixture,
 
  // Cleanup
  plugins.clear();
+ scene.reset();
+
+ window->QuickWindow()->close();
 }
diff --git a/test/integration/minimal_scene.cc b/test/integration/minimal_scene.cc
@@ -144,7 +144,7 @@ TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
  EXPECT_TRUE(app.RemovePlugin(pluginName));
  plugins.clear();
 
+
+ scene.reset();
  win->QuickWindow()->close();
- engine->DestroyScene(scene);
- EXPECT_TRUE(rendering::unloadEngine(engine->Name()));
 }
diff --git a/test/integration/transport_scene_manager.cc b/test/integration/transport_scene_manager.cc
@@ -155,6 +155,10 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
  // Show, but don't exec, so we don't block
  win->QuickWindow()->show();
 
+ // get render engine after window is shown
+ auto engine = gz::gui::testing::getRenderEngine("ogre2");
+ ASSERT_NE(nullptr, engine);
+
  int sleep = 0;
  int maxSleep = 30;
  while (!sceneRequested && sleep < maxSleep)
@@ -166,10 +170,6 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
  EXPECT_TRUE(sceneRequested);
  EXPECT_LT(sleep, maxSleep);
 
- // get render engine after window is shown
- auto engine = gz::gui::testing::getRenderEngine("ogre2");
- ASSERT_NE(nullptr, engine);
-
  auto scene = engine->SceneByName("banana");
  ASSERT_NE(nullptr, scene);
 
@@ -260,8 +260,7 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
  }
  plugins.clear();
 
+ scene.reset();
  win->QuickWindow()->close();
- engine->DestroyScene(scene);
- EXPECT_TRUE(rendering::unloadEngine(engine->Name()));
 }