From a218ae900c5bd5dc545705c4c8eb403217ab3be9 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 27 Oct 2024 20:10:28 +0800 Subject: [PATCH] tests: Fix tests after d2c0b50e25592f8abca8cc47314154934fde9ce7 --- tests/test_pr.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test_pr.py b/tests/test_pr.py index 436d919b..f1665943 100644 --- a/tests/test_pr.py +++ b/tests/test_pr.py @@ -26,8 +26,8 @@ def test_pr_local_eval(helpers: Helpers, capfd: pytest.CaptureFixture) -> None: f.write("foo") subprocess.run(["git", "add", "."]) subprocess.run(["git", "commit", "-m", "example-change"]) - subprocess.run(["git", "checkout", "-b", "pull/1/head"]) - subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/head"]) + subprocess.run(["git", "checkout", "-b", "pull/1/merge"]) + subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/merge"]) path = main( "nixpkgs-review", @@ -54,8 +54,8 @@ def test_pr_local_eval_missing_nom( f.write("foo") subprocess.run(["git", "add", "."]) subprocess.run(["git", "commit", "-m", "example-change"]) - subprocess.run(["git", "checkout", "-b", "pull/1/head"]) - subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/head"]) + subprocess.run(["git", "checkout", "-b", "pull/1/merge"]) + subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/merge"]) path = main( "nixpkgs-review", @@ -82,8 +82,8 @@ def test_pr_local_eval_without_nom( f.write("foo") subprocess.run(["git", "add", "."]) subprocess.run(["git", "commit", "-m", "example-change"]) - subprocess.run(["git", "checkout", "-b", "pull/1/head"]) - subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/head"]) + subprocess.run(["git", "checkout", "-b", "pull/1/merge"]) + subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/merge"]) path = main( "nixpkgs-review", @@ -110,8 +110,8 @@ def test_pr_local_eval_with_sandbox(helpers: Helpers) -> None: f.write("foo") subprocess.run(["git", "add", "."]) subprocess.run(["git", "commit", "-m", "example-change"]) - subprocess.run(["git", "checkout", "-b", "pull/1/head"]) - subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/head"]) + subprocess.run(["git", "checkout", "-b", "pull/1/merge"]) + subprocess.run(["git", "push", str(nixpkgs.remote), "pull/1/merge"]) path = main( "nixpkgs-review", @@ -135,8 +135,8 @@ def test_pr_ofborg_eval(mock_urlopen: MagicMock, helpers: Helpers) -> None: f.write("foo") subprocess.run(["git", "add", "."]) subprocess.run(["git", "commit", "-m", "example-change"]) - subprocess.run(["git", "checkout", "-b", "pull/37200/head"]) - subprocess.run(["git", "push", str(nixpkgs.remote), "pull/37200/head"]) + subprocess.run(["git", "checkout", "-b", "pull/37200/merge"]) + subprocess.run(["git", "push", str(nixpkgs.remote), "pull/37200/merge"]) mock_urlopen.side_effect = [ mock_open(read_data=helpers.read_asset("github-pull-37200.json"))(),