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.

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

test_landings: increase git landing coverage (bug 1934485) #190

Merged
merged 18 commits into from
Jan 17, 2025
Merged

test_landings: increase git landing coverage (bug 1934485) #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fb80301
conftest: dos2unix conversion
shtrom Jan 7, 2025
b4bd0ed
test-landings: add hg_repo_mc fixture
shtrom Jan 6, 2025
e36a839
test_landings: add repo_mc parametrable factory
shtrom Jan 7, 2025
f125504
tests: add git_repo to landings tests
shtrom Jan 7, 2025
484658b
test_git: initialise test_repo with seed patch
shtrom Jan 8, 2025
599f216
tests: don't rstrip diff fixtures (git requires a trailing newline)
shtrom Jan 9, 2025
a13da75
*SCM.apply_patch: add suffix to temporary files
shtrom Jan 9, 2025
40b6d0c
test_landings: allow create_patch_revision to fetch normal patches by…
shtrom Jan 9, 2025
72f1cde
test: ignore denyCurrentBranch in git repo fixture
shtrom Jan 9, 2025
8375fc2
GitSCM: set Git user on local clone
shtrom Jan 9, 2025
2588f72
GitSCM.update_repo: use git fetch rather than pull
shtrom Jan 10, 2025
a5cff9f
Update src/lando/api/tests/test_landings.py
shtrom Jan 13, 2025
be12b48
Update src/lando/main/tests/conftest.py
shtrom Jan 13, 2025
9a7f1cd
fixup! landing_worker: add and use git scm support (bug 1895523) (#147)
shtrom Jan 13, 2025
4e8e277
test_landings: update repo_mc factory to allow parameters
shtrom Jan 13, 2025
11bc37a
Merge remote-tracking branch 'origin/main' into bug1934485/landing-te…
shtrom Jan 15, 2025
e7428e2
fixup! tests: add git_repo to landings tests
shtrom Jan 17, 2025
ab884d9
fixup! fixup! landing_worker: add and use git scm support (bug 189552…
shtrom Jan 17, 2025
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
11 changes: 8 additions & 3 deletions src/lando/api/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@
from lando.main.models import SCM_LEVEL_1, SCM_LEVEL_3, Profile, Repo
from lando.main.scm import SCM_TYPE_HG
from lando.main.support import LegacyAPIException
from lando.main.tests.conftest import git_repo, git_repo_seed
from lando.utils.phabricator import PhabricatorClient

# We need some local usage of those imported fixtures to satisfy the linters.
# This is it.
__all__ = ["git_repo", "git_repo_seed"]

PATCH_NORMAL_1 = r"""
# HG changeset patch
# User Test User <[email protected]>
Expand All @@ -45,7 +50,7 @@
@@ -1,1 +1,2 @@
TEST
+adding another line
""".strip()
""".lstrip()

PATCH_NORMAL_2 = r"""
# HG changeset patch
Expand All @@ -61,7 +66,7 @@
TEST
adding another line
+adding one more line
""".strip()
""".lstrip()

PATCH_NORMAL_3 = r"""
# HG changeset patch
Expand All @@ -82,7 +87,7 @@
+++ b/blah.txt
@@ -0,0 +1,1 @@
+TEST
""".strip()
""".lstrip()


@pytest.fixture
Expand Down
Loading
Loading