def test_srpm_merge_storm(mock_remote_functionality_sourcegit,
api_instance_source_git, ref):
sg_path = Path(api_instance_source_git.upstream_local_project.working_dir)
mock_spec_download_remote_s(sg_path, sg_path / DISTRO_DIR, "0.1.0")
create_merge_commit_in_source_git(sg_path, go_nuts=True)
# linearization creates a new branch, make some arbitrary moves to verify
# we end up in the former branch after the build
subprocess.check_call(["git", "checkout", "-B", "test-branch"],
cwd=sg_path)
subprocess.check_call(["git", "checkout", "main"], cwd=sg_path)
with cwd(sg_path):
api_instance_source_git.create_srpm(upstream_ref=ref)
srpm_path = list(sg_path.glob("beer-0.1.0-2.*.src.rpm"))[0]
assert srpm_path.is_file()
build_srpm(srpm_path)
branches = subprocess.check_output(
["git", "for-each-ref", "--format=%(refname:short)", "refs/heads/"],
cwd=sg_path).split(b"\n")
for b in branches:
if b and b.startswith(b"packit-patches-"):
break
else:
raise AssertionError(
"packit-patches- branch was not found - this should trigger the linearization"
)
# make sure we are on the main branch
assert ("main" == subprocess.check_output(
["git", "branch", "--show-current"], cwd=sg_path).decode().strip())
assert {x.name
for x in sg_path.joinpath(DISTRO_DIR).glob("*.patch")} == {
"0001-MERGE-COMMIT.patch",
"0002-ugly-merge-commit.patch",
}
def test_srpm_merge_storm(mock_remote_functionality_sourcegit,
api_instance_source_git, ref):
sg_path = Path(api_instance_source_git.upstream_local_project.working_dir)
mock_spec_download_remote_s(sg_path, sg_path / "fedora", "0.1.0")
create_merge_commit_in_source_git(sg_path, go_nuts=True)
with cwd(sg_path):
api_instance_source_git.create_srpm(upstream_ref=ref)
srpm_path = list(sg_path.glob("beer-0.1.0-2.*.src.rpm"))[0]
assert srpm_path.is_file()
build_srpm(srpm_path)
branches = subprocess.check_output(
["git", "for-each-ref", "--format=%(refname:short)", "refs/heads/"],
cwd=sg_path).split(b"\n")
for b in branches:
if b and b.startswith(b"packit-patches-"):
break
else:
raise AssertionError(
"packit-patches- branch was not found - this should trigger the linearization"
)
assert {x.name
for x in sg_path.joinpath("fedora").glob("*.patch")} == {
"0001-MERGE-COMMIT.patch",
"0002-ugly-merge-commit.patch",
}
def test_srpm(mock_remote_functionality_sourcegit, api_instance_source_git):
sg_path = Path(api_instance_source_git.upstream_local_project.working_dir)
mock_spec_download_remote_s(sg_path / "fedora")
create_merge_commit_in_source_git(sg_path)
with cwd(sg_path):
api_instance_source_git.create_srpm(upstream_ref="0.1.0")
srpm_path = list(sg_path.glob("beer-0.1.0-2.*.src.rpm"))[0]
assert srpm_path.is_file()
build_srpm(srpm_path)
def test_basic_local_update_patch_content_with_metadata(
sourcegit_and_remote,
distgit_and_remote,
mock_remote_functionality_sourcegit,
api_instance_source_git,
):
""" propose-update for sourcegit test: mock remote API, use local upstream and dist-git """
sourcegit, _ = sourcegit_and_remote
distgit, _ = distgit_and_remote
mock_spec_download_remote_s(distgit)
create_merge_commit_in_source_git(sourcegit)
source_file = sourcegit / "big-source-file.txt"
source_file.write_text("new changes")
git_add_and_commit(
directory=sourcegit,
message="source change\n"
"patch_name: testing.patch\n"
"description: Few words for info.",
)
source_file = sourcegit / "ignored_file.txt"
source_file.write_text(" And I am sad.")
git_add_and_commit(directory=sourcegit, message="make a file sad")
api_instance_source_git.sync_release(
dist_git_branch="master",
version="0.1.0",
use_local_content=True,
upstream_ref="0.1.0",
)
git_diff = subprocess.check_output(["git", "diff", "HEAD~", "HEAD"],
cwd=distgit).decode()
patches = """
+# PATCHES FROM SOURCE GIT:
+
+# switching to amarillo hops
+# Author: Packit Test Suite <*****@*****.**>
+Patch0001: 0001-switching-to-amarillo-hops.patch
+
+# actually, let's do citra
+# Author: Packit Test Suite <*****@*****.**>
+Patch0002: 0002-actually-let-s-do-citra.patch
+
+# source change
+# Author: Packit Test Suite <*****@*****.**>
+# Few words for info.
+Patch0003: testing.patch
+
+
%description
"""
assert patches in git_diff
def test_srpm_merge_storm_dirty(api_instance_source_git):
"""verify the linearization is halted when a source-git repo si dirty"""
ref = "0.1.0"
sg_path = Path(api_instance_source_git.upstream_local_project.working_dir)
mock_spec_download_remote_s(sg_path, sg_path / DISTRO_DIR, ref)
create_merge_commit_in_source_git(sg_path, go_nuts=True)
(sg_path / "malt").write_text("Mordor\n")
with pytest.raises(PackitException) as ex:
with cwd("/"): # let's mimic p-s by having different cwd than the project
api_instance_source_git.create_srpm(upstream_ref=ref)
assert "The source-git repo is dirty" in str(ex.value)
def test_linearization(api_instance_source_git):
ref = "0.1.0"
sg_path = Path(api_instance_source_git.upstream_local_project.working_dir)
mock_spec_download_remote_s(sg_path, sg_path / DISTRO_DIR, ref)
create_merge_commit_in_source_git(sg_path, go_nuts=True)
with cwd("/"): # let's mimic p-s by having different cwd than the project
pg = PatchGenerator(api_instance_source_git.upstream_local_project)
pg.create_patches(ref, sg_path / DISTRO_DIR)
assert {x.name for x in sg_path.joinpath(DISTRO_DIR).glob("*.patch")} == {
"0001-sourcegit-content.patch",
"0002-MERGE-COMMIT.patch",
"0003-ugly-merge-commit.patch",
}
def test_srpm(mock_remote_functionality_sourcegit, api_instance_source_git, ref):
sg_path = Path(api_instance_source_git.upstream_local_project.working_dir)
mock_spec_download_remote_s(sg_path, sg_path / DISTRO_DIR, "0.1.0")
create_merge_commit_in_source_git(sg_path)
with cwd(sg_path):
api_instance_source_git.create_srpm(upstream_ref=ref)
srpm_path = list(sg_path.glob("beer-0.1.0-2.*.src.rpm"))[0]
assert srpm_path.is_file()
build_srpm(srpm_path)
branches = subprocess.check_output(
["git", "for-each-ref", "--format=%(refname:short)", "refs/heads/"], cwd=sg_path
).split(b"\n")
for b in branches:
if b and b.startswith(b"packit-patches-"):
raise AssertionError(
"packit-patches- branch was found - the history shouldn't have been linearized"
)
assert {x.name for x in sg_path.joinpath(DISTRO_DIR).glob("*.patch")} == {
"0001-switching-to-amarillo-hops.patch",
"0002-actually-let-s-do-citra.patch",
}
def test_basic_local_update_patch_content_with_downstream_patch(
sourcegit_and_remote,
distgit_and_remote,
mock_remote_functionality_sourcegit,
api_instance_source_git,
):
""" propose-update for sourcegit test: mock remote API, use local upstream and dist-git """
sourcegit, _ = sourcegit_and_remote
distgit, _ = distgit_and_remote
mock_spec_download_remote_s(distgit)
create_merge_commit_in_source_git(sourcegit)
source_file = sourcegit / "ignored_file.txt"
source_file.write_text(" And I am sad.")
git_add_and_commit(directory=sourcegit, message="make a file sad")
api_instance_source_git.sync_release(
dist_git_branch="main",
version="0.1.0",
upstream_ref="0.1.0",
)
git_diff = subprocess.check_output(["git", "diff", "HEAD~", "HEAD"],
cwd=distgit).decode()
patches = """
+# switching to amarillo hops
+# Author: Packit Test Suite <*****@*****.**>
+Patch0001: 0001-switching-to-amarillo-hops.patch
+
+# actually, let's do citra
+# Author: Packit Test Suite <*****@*****.**>
+Patch0002: 0002-actually-let-s-do-citra.patch
+
+
"""
assert patches in git_diff
def test_basic_local_update_patch_content(
sourcegit_and_remote,
distgit_and_remote,
mock_remote_functionality_sourcegit,
api_instance_source_git,
):
""" propose-update for sourcegit test: mock remote API, use local upstream and dist-git """
sourcegit, _ = sourcegit_and_remote
distgit, _ = distgit_and_remote
mock_spec_download_remote_s(distgit)
create_merge_commit_in_source_git(sourcegit)
source_file = sourcegit / "big-source-file.txt"
source_file.write_text("new changes")
git_add_and_commit(directory=sourcegit, message="source change")
source_file = sourcegit / "ignored_file.txt"
source_file.write_text(" And I am sad.")
git_add_and_commit(directory=sourcegit, message="make a file sad")
api_instance_source_git.sync_release("master",
"0.1.0",
upstream_ref="0.1.0")
git_diff = subprocess.check_output(["git", "diff", "HEAD~", "HEAD"],
cwd=distgit).decode()
assert ("""
-Version: 0.0.0
+Version: 0.1.0""" in git_diff)
patches = """
+# PATCHES FROM SOURCE GIT:
+
+# switching to amarillo hops
+# Author: Packit Test Suite <*****@*****.**>
+Patch0001: 0001-switching-to-amarillo-hops.patch
+
+# actually, let's do citra
+# Author: Packit Test Suite <*****@*****.**>
+Patch0002: 0002-actually-let-s-do-citra.patch
+
+# source change
+# Author: Packit Test Suite <*****@*****.**>
+Patch0003: 0003-source-change.patch
+
+
%description
"""
assert patches in git_diff
assert "Patch0004:" not in git_diff
assert (""" - 0.1.0-1
+- new upstream release: 0.1.0
+
* Sun Feb 24 2019 Tomas Tomecek <*****@*****.**> - 0.0.0-1
- No brewing, yet.""" in git_diff)
# direct diff in the synced file
assert ("""diff --git a/.packit.yaml b/.packit.yaml
new file mode 100644""" in git_diff)
assert ("""
--- /dev/null
+++ b/.packit.yaml""" in git_diff)
# diff of the synced file should not be in the patch
assert ("""
+diff --git a/.packit.yaml b/.packit.yaml
+new file mode 100644""" not in git_diff)
patch_1_3 = """
+Subject: [PATCH 1/3] switching to amarillo hops
+
+---
+ hops | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hops b/hops"""
assert patch_1_3 in git_diff
assert ("""\
+--- a/hops
++++ b/hops
+@@ -1 +1 @@
+-Cascade
++Amarillo
+--""" in git_diff)
assert ("""\
+Subject: [PATCH 2/3] actually, let's do citra
+
+---
+ hops | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hops b/hops""" in git_diff)
assert (("""\
+--- a/hops
++++ b/hops
+@@ -1 +1 @@
+-Amarillo
++Citra
+--""") in git_diff)
assert ("""
+--- a/big-source-file.txt
++++ b/big-source-file.txt
+@@ -1,2 +1 @@
+-This is a testing file
+-containing some text.
++new changes""" in git_diff)
# diff of the source files (not synced) should not be directly in the git diff
assert ("""
+Subject: [PATCH 3/3] source change
+
+---
+ big-source-file.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/big-source-file.txt b/big-source-file.txt""" in git_diff)
# ignored file should not be in the diff
assert "--- a/ignored_file.txt\n" not in git_diff
def test_basic_local_update_patch_content(
sourcegit_and_remote,
distgit_and_remote,
mock_remote_functionality_sourcegit,
api_instance_source_git,
):
"""propose-downstream for sourcegit test: mock remote API, use local upstream and dist-git
Check that commit origin is not marked when 'mark_commit_origin' is set to False.
"""
sourcegit, _ = sourcegit_and_remote
distgit, _ = distgit_and_remote
mock_spec_download_remote_s(distgit)
create_merge_commit_in_source_git(sourcegit)
source_file = sourcegit / "big-source-file.txt"
source_file.write_text("new changes")
git_add_and_commit(directory=sourcegit, message="source change")
source_file = sourcegit / "ignored_file.txt"
source_file.write_text(" And I am sad.")
git_add_and_commit(directory=sourcegit, message="make a file sad")
api_instance_source_git.sync_release(
dist_git_branch="main",
version="0.1.0",
upstream_ref="0.1.0",
mark_commit_origin=False,
)
git_diff = subprocess.check_output(["git", "diff", "HEAD~", "HEAD"],
cwd=distgit).decode()
assert "From-source-git-commit" not in git.Repo(
distgit).head.commit.message
assert ("""
-Version: 0.0.0
+Version: 0.1.0""" in git_diff)
# Make sure the patches are placed after Source0, but outside %if %endif
patches = """\
Source0: %{upstream_name}-%{version}.tar.gz
%endif
+# switching to amarillo hops
+# Author: Packit Test Suite <*****@*****.**>
+Patch0001: 0001-switching-to-amarillo-hops.patch
+# actually, let's do citra
+# Author: Packit Test Suite <*****@*****.**>
+Patch0002: 0002-actually-let-s-do-citra.patch
+# source change
+# Author: Packit Test Suite <*****@*****.**>
+Patch0003: 0003-source-change.patch
BuildArch: noarch
"""
assert patches in git_diff
assert "Patch0004:" not in git_diff
assert (""" - 0.1.0-1
+- Initial brewing
+
* Sun Feb 24 2019 Tomas Tomecek <*****@*****.**> - 0.0.0-1
- No brewing, yet.""" in git_diff)
patch_1_3 = """
+Subject: [PATCH 1/3] switching to amarillo hops
+
+---
+ hops | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hops b/hops"""
assert patch_1_3 in git_diff
assert ("""\
+--- a/hops
++++ b/hops
+@@ -1 +1 @@
+-Cascade
++Amarillo
+--""" in git_diff)
assert ("""\
+Subject: [PATCH 2/3] actually, let's do citra
+
+---
+ hops | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hops b/hops""" in git_diff)
assert (("""\
+--- a/hops
++++ b/hops
+@@ -1 +1 @@
+-Amarillo
++Citra
+--""") in git_diff)
assert ("""
+--- a/big-source-file.txt
++++ b/big-source-file.txt
+@@ -1,2 +1 @@
+-This is a testing file
+-containing some text.
++new changes""" in git_diff)
# diff of the source files (not synced) should not be directly in the git diff
assert ("""
+Subject: [PATCH 3/3] source change
+
+---
+ big-source-file.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/big-source-file.txt b/big-source-file.txt""" in git_diff)
# ignored file should not be in the diff
assert "--- a/ignored_file.txt\n" not in git_diff
