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 timeout value in std output (backport #1807) #1812

Merged
merged 2 commits into from
Oct 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 25, 2024

We were using the wrong timeout in the terminal output there.

As pointed out in #1501 (comment)

Thanks @tonynajjar for spotting this!


This is an automatic backport of pull request #1807 done by Mergify.

We were using the wrong timeout in the terminal output there.

(cherry picked from commit cb91599)

# Conflicts:
#	controller_manager/controller_manager/controller_manager_services.py
Copy link
Contributor Author

mergify bot commented Oct 25, 2024

Cherry-pick of cb91599 has failed:

On branch mergify/bp/humble/pr-1807
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit cb91599.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/controller_manager/controller_manager_services.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Oct 25, 2024
Copy link

codecov bot commented Oct 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.55%. Comparing base (7b07963) to head (b3615ae).
Report is 1 commits behind head on humble.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1812      +/-   ##
==========================================
+ Coverage   62.34%   62.55%   +0.20%     
==========================================
  Files         108      108              
  Lines       11412    12025     +613     
  Branches     7979     8129     +150     
==========================================
+ Hits         7115     7522     +407     
- Misses        820      882      +62     
- Partials     3477     3621     +144     
Flag Coverage Δ
unittests 62.55% <ø> (+0.20%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
.../controller_manager/controller_manager_services.py 72.41% <ø> (ø)

... and 75 files with indirect coverage changes

@christophfroehlich christophfroehlich merged commit 8bf8a6c into humble Oct 25, 2024
10 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1807 branch October 25, 2024 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants