Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix loading worlds from CLI #1627

Merged
merged 2 commits into from
Aug 4, 2022
Merged

Fix loading worlds from CLI #1627

merged 2 commits into from
Aug 4, 2022

Conversation

chapulina
Copy link
Contributor

🦟 Bug fix

Summary

I introduced a critical bug right at the end of #1536 when I added a test. I moved the logic to publish a starting world into the if (!hasSdfFile && _waitGui && !isPlayback), which means that when the user tries to load any world, i.e. ign gazebo shapes.sdf, the server hangs forever waiting for a starting world from the GUI, and the GUI never sends it.

The solution is to always publish the starting world if _waitGui, even if hasSdfFile.

To test the fix, run:

  • ign gazebo shapes.sdf - shouldn't hang
  • UNIT_Gui_TEST - should pass even with this change

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina added bug Something isn't working GUI Gazebo's graphical interface (not pure Ignition GUI) labels Aug 3, 2022
@chapulina chapulina requested a review from mayman99 August 3, 2022 23:05
@github-actions github-actions bot added the 🏰 citadel Ignition Citadel label Aug 3, 2022
Signed-off-by: Louise Poubel <louise@openrobotics.org>
src/gui/Gui.cc Outdated Show resolved Hide resolved
@mjcarroll
Copy link
Contributor

Is homebrew expected to be broken? It's looking for gz-gazebo3.

@chapulina
Copy link
Contributor Author

Is homebrew expected to be broken? It's looking for gz-gazebo3.

@codecov
Copy link

codecov bot commented Aug 4, 2022

Codecov Report

Merging #1627 (f074316) into ign-gazebo3 (2edbf56) will increase coverage by 0.04%.
The diff coverage is 57.14%.

@@               Coverage Diff               @@
##           ign-gazebo3    #1627      +/-   ##
===============================================
+ Coverage        77.94%   77.98%   +0.04%     
===============================================
  Files              255      255              
  Lines            15039    15041       +2     
===============================================
+ Hits             11722    11730       +8     
+ Misses            3317     3311       -6     
Impacted Files Coverage Δ
src/gui/Gui.cc 75.52% <57.14%> (+0.25%) ⬆️
src/SimulationRunner.cc 94.51% <0.00%> (+1.06%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@chapulina chapulina merged commit 1cf75f3 into ign-gazebo3 Aug 4, 2022
@chapulina chapulina deleted the chapulina/3/fix_qs branch August 4, 2022 02:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working 🏰 citadel Ignition Citadel GUI Gazebo's graphical interface (not pure Ignition GUI)
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants