Skip to content

[Python3] Fix test failures in update_checkout #33141

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 28, 2020
Merged

[Python3] Fix test failures in update_checkout #33141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf9e73c
Use correct relative import for Python 2&3
tbkka Jul 27, 2020
c7358fc
Remove unused variable
tbkka Jul 27, 2020
488a5ea
Fix import ordering per python_lint
tbkka Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions utils/update_checkout/tests/test_update_worktree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

import os

from scheme_mock import call_quietly

from . import scheme_mock
from .scheme_mock import call_quietly


WORKTREE_NAME = "feature"

Expand Down
2 changes: 1 addition & 1 deletion utils/update_checkout/update_checkout/update_checkout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def update_single_repository(pool_args):
result = shell.run(['git', 'rev-parse', checkout_target])
revision = result[0].strip()
shell.run(['git', 'checkout', revision], echo=True)
except Exception as e:
except Exception:
raise originalException

# It's important that we checkout, fetch, and rebase, in order.
Expand Down