Skip to content

[remote-branch-rename] Improve verify logic and update tests #260

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
jovnc merged 4 commits into from
Feb 7, 2026
Merged

[remote-branch-rename] Improve verify logic and update tests #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32979c8
[remote-branch-rename] Improve exercise and update test
jovnc Feb 7, 2026
7653169
[remote-branch-rename] Update tests
jovnc Feb 7, 2026
339b0dd
[remote-branch-rename] Add tests
jovnc Feb 7, 2026
94a0580
[remote-branch-rename] Fix typo in existing message
jovnc Feb 7, 2026
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
5 changes: 0 additions & 5 deletions remote_branch_rename/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@


def setup(verbose: bool = False):
checkout("try-quick-fix", True, verbose)
empty_commit("Fixed scrolling issue", verbose)

checkout("main", False, verbose)

checkout("improve-loadding", True, verbose)
empty_commit("Improved loading of page", verbose)

Expand Down
94 changes: 26 additions & 68 deletions remote_branch_rename/test_verify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
from contextlib import contextmanager
from typing import Iterator, Tuple
from unittest.mock import patch

from repo_smith.repo_smith import RepoSmith

from exercise_utils.test import (
GitAutograderTest,
GitAutograderTestLoader,
GitMasteryHelper,
assert_output,
)
from git_autograder import GitAutograderStatus

from .verify import (
FIX_SCROLLING_BUG_MISSING,
IMPROVE_LOADING_LOCAL_MISSING,
IMPROVE_LOADING_LOCAL_STILL_EXISTS,
IMPROVE_LOADING_REMOTE_MISSING,
IMPROVE_LOADING_REMOTE_OLD_PRESENT,
NO_RENAME_EVIDENCE_TRY_QUICK_FIX,
TRY_QUICK_FIX_STILL_EXISTS,
NO_RENAME_EVIDENCE_IMPROVE_LOADING,
verify,
)

Expand All @@ -30,100 +26,68 @@

@contextmanager
def base_setup() -> Iterator[Tuple[GitAutograderTest, RepoSmith]]:
with loader.start() as (test, rs):
rs.git.commit(message="Empty", allow_empty=True)
rs.helper(GitMasteryHelper).create_start_tag()
rs.git.branch("try-quick-fix")
with loader.start(include_remote_repo=True) as (test, rs, rs_remote):
remote_path = str(rs_remote.repo.git_dir)

rs.git.commit(message="Improved loading of page", allow_empty=True)
rs.git.remote_add("origin", remote_path)
rs.git.branch("improve-loadding")
rs.git.push("origin", "improve-loadding")

yield test, rs


def test_base():
with (
patch("remote_branch_rename.verify.fetch_remotes", side_effect=None),
patch(
"remote_branch_rename.verify.get_remotes", return_value=["improve-loading"]
),
base_setup() as (test, rs),
):
rs.git.branch("fix-scrolling-bug", old_branch="try-quick-fix", move=True)
rs.git.branch("improve-loading", old_branch="improve-loadding", move=True)

output = test.run()
assert_output(output, GitAutograderStatus.SUCCESSFUL)


def test_new_fix_scrolling_bug_branch():
with base_setup() as (test, rs):
rs.git.branch("fix-scrolling-bug")
rs.git.branch("improve-loading", old_branch="improve-loadding", move=True)

output = test.run()
assert_output(
output, GitAutograderStatus.UNSUCCESSFUL, [TRY_QUICK_FIX_STILL_EXISTS]
)


def test_rename_quick_fix_wrong():
with base_setup() as (test, rs):
rs.git.branch("fix-scroling-bug", old_branch="try-quick-fix", move=True)
rs.git.branch("improve-loading", old_branch="improve-loadding", move=True)
rs.git.push("origin", "improve-loading")
rs.git.push("origin", ":improve-loadding")

output = test.run()
assert_output(
output, GitAutograderStatus.UNSUCCESSFUL, [FIX_SCROLLING_BUG_MISSING]
)
assert_output(output, GitAutograderStatus.SUCCESSFUL)


def test_not_quick_fix_rename():
def test_new_improve_loading_branch():
with base_setup() as (test, rs):
rs.git.branch("not-this", old_branch="try-quick-fix", move=True)
rs.git.branch("improve-loading", old_branch="improve-loadding", move=True)
rs.git.branch("fix-scrolling-bug")
rs.git.branch("improve-loading")

output = test.run()
assert_output(
output, GitAutograderStatus.UNSUCCESSFUL, [NO_RENAME_EVIDENCE_TRY_QUICK_FIX]
output,
GitAutograderStatus.UNSUCCESSFUL,
[IMPROVE_LOADING_LOCAL_STILL_EXISTS],
)


def test_new_improve_loading_branch():
def test_rename_improve_loading_wrong():
with base_setup() as (test, rs):
rs.git.branch("fix-scrolling-bug", old_branch="try-quick-fix", move=True)
rs.git.branch("improve-loading")
rs.git.branch("improve-loaing", old_branch="improve-loadding", move=True)

output = test.run()
assert_output(
output,
GitAutograderStatus.UNSUCCESSFUL,
[IMPROVE_LOADING_LOCAL_STILL_EXISTS],
[IMPROVE_LOADING_LOCAL_MISSING],
)


def test_rename_improve_loading_wrong():
def test_improve_loading_no_rename_evidence():
with base_setup() as (test, rs):
rs.git.branch("fix-scrolling-bug", old_branch="try-quick-fix", move=True)
rs.git.branch("improve-loaing", old_branch="improve-loadding", move=True)
rs.git.branch("improve-loading")
rs.git.branch("improve-loadding", delete=True)

output = test.run()
assert_output(
output,
GitAutograderStatus.UNSUCCESSFUL,
[IMPROVE_LOADING_LOCAL_MISSING],
[NO_RENAME_EVIDENCE_IMPROVE_LOADING],
)


def test_improve_loadding_remote_exists():
with (
patch("remote_branch_rename.verify.fetch_remotes", side_effect=None),
patch(
"remote_branch_rename.verify.get_remotes", return_value=["improve-loadding"]
),
base_setup() as (test, rs),
):
rs.git.branch("fix-scrolling-bug", old_branch="try-quick-fix", move=True)
with base_setup() as (test, rs):
rs.git.branch("improve-loading", old_branch="improve-loadding", move=True)
rs.git.push("origin", "improve-loading")

output = test.run()
assert_output(
Expand All @@ -134,15 +98,9 @@ def test_improve_loadding_remote_exists():


def test_improve_loading_remote_missing():
with (
patch("remote_branch_rename.verify.fetch_remotes", side_effect=None),
patch(
"remote_branch_rename.verify.get_remotes", return_value=["improve-loaing"]
),
base_setup() as (test, rs),
):
rs.git.branch("fix-scrolling-bug", old_branch="try-quick-fix", move=True)
with base_setup() as (test, rs):
rs.git.branch("improve-loading", old_branch="improve-loadding", move=True)
rs.git.push("origin", ":improve-loadding")

output = test.run()
assert_output(
Expand Down
22 changes: 2 additions & 20 deletions remote_branch_rename/verify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,13 @@
GitAutograderStatus,
)

TRY_QUICK_FIX_STILL_EXISTS = (
"Branch 'try-quick-fix' still exists! Remember to rename it to 'fix-scrolling-bug'"
)
FIX_SCROLLING_BUG_MISSING = "Branch 'fix-scrolling-bug' is missing, did you correctly rename the branch 'try-quick-fix' to 'fix-scrolling-bug'?"
NO_RENAME_EVIDENCE_TRY_QUICK_FIX = (
"Branch 'try-quick-fix' was not renamed to 'fix-scrolling-bug'!"
)

IMPROVE_LOADING_LOCAL_STILL_EXISTS = "Local branch 'improve-loadding' still exists! Remember to rename it to 'improve-loading'"
IMPROVE_LOADING_LOCAL_MISSING = "Local branch 'improve-loading' is missing, did you correctly rename the branch 'improve-loadding' to 'improve-loading'?"
NO_RENAME_EVIDENCE_IMPROVE_LOADING = (
"Local branch 'improve-loadding' was not renamed to 'improve-loading'!"
)
IMPROVE_LOADING_REMOTE_MISSING = "Remote branch 'improve-loading' is missing, did you correctly push the renamed branch to the remote?"
IMPROVE_LOADING_REMOTE_OLD_PRESENT = "Remote branch 'improve-loadding' still exists! Remember to rename it to 'improve-loadding'"
IMPROVE_LOADING_REMOTE_OLD_PRESENT = "Remote branch 'improve-loadding' still exists! Remember to rename it to 'improve-loading'"


def branch_has_rename_evidence(
Expand Down Expand Up @@ -72,18 +64,8 @@ def has_remote(remotes: List[str], target: str) -> bool:
def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
repo: Repo = exercise.repo.repo

# try-quick-fix -> fix-scrolling-bug
local_branches = [h.name for h in repo.heads]
if "try-quick-fix" in local_branches:
raise exercise.wrong_answer([TRY_QUICK_FIX_STILL_EXISTS])

if "fix-scrolling-bug" not in local_branches:
raise exercise.wrong_answer([FIX_SCROLLING_BUG_MISSING])

if not branch_has_rename_evidence(exercise, "fix-scrolling-bug", "try-quick-fix"):
raise exercise.wrong_answer([NO_RENAME_EVIDENCE_TRY_QUICK_FIX])

# improve-loadding -> improve-loading
local_branches = [h.name for h in repo.heads]
if "improve-loadding" in local_branches:
raise exercise.wrong_answer([IMPROVE_LOADING_LOCAL_STILL_EXISTS])

Expand Down