From d638c810ebf5dc99b928484eec899caa00474677 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mar 17 2021 14:52:20 +0000 Subject: Fix tests --- diff --git a/tests/integration/test_source_git.py b/tests/integration/test_source_git.py index 20da3f6..f4e2c09 100644 --- a/tests/integration/test_source_git.py +++ b/tests/integration/test_source_git.py @@ -132,11 +132,14 @@ def test_basic_local_update_patch_content( +Version: 0.1.0""" in git_diff ) - - # make sure the patches are placed after Source0 - patches = """\ + # Make sure the patches are placed after Source0, but outside %if %endif + patches = ( + """\ Source0: %{upstream_name}-%{version}.tar.gz -+ + %endif + BuildArch: noarch + """ # because linters would remove the trailing whitespace + + """ +# switching to amarillo hops +# Author: Packit Test Suite +Patch0001: 0001-switching-to-amarillo-hops.patch @@ -149,8 +152,8 @@ Source0: %{upstream_name}-%{version}.tar.gz +# Author: Packit Test Suite +Patch0003: 0003-source-change.patch + -+ """ + ) assert patches in git_diff assert "Patch0004:" not in git_diff @@ -312,7 +315,6 @@ def test_basic_local_update_patch_content_with_metadata( +# Few words for info. +Patch0003: testing.patch + -+ """ assert patches in git_diff @@ -361,7 +363,6 @@ def test_basic_local_update_patch_content_with_metadata_and_patch_ignored( +# Author: Packit Test Suite +Patch0002: 0002-actually-let-s-do-citra.patch + -+ """ assert patches in git_diff @@ -403,7 +404,6 @@ def test_basic_local_update_patch_content_with_downstream_patch( +# Author: Packit Test Suite +Patch0002: 0002-actually-let-s-do-citra.patch + -+ """ assert patches in git_diff