From a5a65fe69c618ace3f3c4a702d0dd2eada2365f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Thu, 4 Aug 2022 16:22:32 +0200 Subject: [PATCH] Dont use garbled patches for test fixture obs-service-source_validator recently gained the feature to reject empty or garbled patches, and hence this was failing. Use a validly formatted patch instead. --- tests/fixtures/packages/blowfish-patch-as-source/test.patch | 5 ++++- .../packages/blowfish-with-patch-changes/blowfish.spec | 2 +- .../fixtures/packages/blowfish-with-patch-changes/test.patch | 5 ++++- tests/fixtures/packages/blowfish-with-patch/blowfish.spec | 2 +- tests/fixtures/packages/blowfish-with-patch/test.patch | 5 ++++- .../packages/blowfish-with-remote-service/blowfish.spec | 2 +- .../packages/blowfish-with-remote-service/test.patch | 5 ++++- .../fixtures/packages/blowfish-with-rpmlintrc/blowfish.spec | 2 +- tests/fixtures/packages/blowfish-with-rpmlintrc/test.patch | 5 ++++- 9 files changed, 24 insertions(+), 9 deletions(-) diff --git a/tests/fixtures/packages/blowfish-patch-as-source/test.patch b/tests/fixtures/packages/blowfish-patch-as-source/test.patch index 6fcb6ba2..26e7f763 100644 --- a/tests/fixtures/packages/blowfish-patch-as-source/test.patch +++ b/tests/fixtures/packages/blowfish-patch-as-source/test.patch @@ -1 +1,4 @@ -Not really a patch +--- README.txt ++++ README.txt +@@ -0,0 +1 @@ ++This works diff --git a/tests/fixtures/packages/blowfish-with-patch-changes/blowfish.spec b/tests/fixtures/packages/blowfish-with-patch-changes/blowfish.spec index d70aa4fc..df99aa2b 100644 --- a/tests/fixtures/packages/blowfish-with-patch-changes/blowfish.spec +++ b/tests/fixtures/packages/blowfish-with-patch-changes/blowfish.spec @@ -11,7 +11,7 @@ Summary: Blowfish License: GPL-2.0-only URL: https://github.com/openSUSE/cockpit-wicked Source: blowfish-1.tar.gz -Patch1: test.patch +Patch1: test.patch BuildArch: noarch %prep diff --git a/tests/fixtures/packages/blowfish-with-patch-changes/test.patch b/tests/fixtures/packages/blowfish-with-patch-changes/test.patch index 7ebeead2..26e7f763 100644 --- a/tests/fixtures/packages/blowfish-with-patch-changes/test.patch +++ b/tests/fixtures/packages/blowfish-with-patch-changes/test.patch @@ -1 +1,4 @@ -+- +--- README.txt ++++ README.txt +@@ -0,0 +1 @@ ++This works diff --git a/tests/fixtures/packages/blowfish-with-patch/blowfish.spec b/tests/fixtures/packages/blowfish-with-patch/blowfish.spec index 401ba35f..862d2df4 100644 --- a/tests/fixtures/packages/blowfish-with-patch/blowfish.spec +++ b/tests/fixtures/packages/blowfish-with-patch/blowfish.spec @@ -11,7 +11,7 @@ Summary: Blowfish License: GPL-2.0-only URL: https://github.com/openSUSE/cockpit-wicked Source: blowfish-1.tar.gz -Patch1: test.patch +Patch1: test.patch BuildArch: noarch %prep diff --git a/tests/fixtures/packages/blowfish-with-patch/test.patch b/tests/fixtures/packages/blowfish-with-patch/test.patch index 7ebeead2..26e7f763 100644 --- a/tests/fixtures/packages/blowfish-with-patch/test.patch +++ b/tests/fixtures/packages/blowfish-with-patch/test.patch @@ -1 +1,4 @@ -+- +--- README.txt ++++ README.txt +@@ -0,0 +1 @@ ++This works diff --git a/tests/fixtures/packages/blowfish-with-remote-service/blowfish.spec b/tests/fixtures/packages/blowfish-with-remote-service/blowfish.spec index 401ba35f..862d2df4 100644 --- a/tests/fixtures/packages/blowfish-with-remote-service/blowfish.spec +++ b/tests/fixtures/packages/blowfish-with-remote-service/blowfish.spec @@ -11,7 +11,7 @@ Summary: Blowfish License: GPL-2.0-only URL: https://github.com/openSUSE/cockpit-wicked Source: blowfish-1.tar.gz -Patch1: test.patch +Patch1: test.patch BuildArch: noarch %prep diff --git a/tests/fixtures/packages/blowfish-with-remote-service/test.patch b/tests/fixtures/packages/blowfish-with-remote-service/test.patch index 7ebeead2..26e7f763 100644 --- a/tests/fixtures/packages/blowfish-with-remote-service/test.patch +++ b/tests/fixtures/packages/blowfish-with-remote-service/test.patch @@ -1 +1,4 @@ -+- +--- README.txt ++++ README.txt +@@ -0,0 +1 @@ ++This works diff --git a/tests/fixtures/packages/blowfish-with-rpmlintrc/blowfish.spec b/tests/fixtures/packages/blowfish-with-rpmlintrc/blowfish.spec index 401ba35f..862d2df4 100644 --- a/tests/fixtures/packages/blowfish-with-rpmlintrc/blowfish.spec +++ b/tests/fixtures/packages/blowfish-with-rpmlintrc/blowfish.spec @@ -11,7 +11,7 @@ Summary: Blowfish License: GPL-2.0-only URL: https://github.com/openSUSE/cockpit-wicked Source: blowfish-1.tar.gz -Patch1: test.patch +Patch1: test.patch BuildArch: noarch %prep diff --git a/tests/fixtures/packages/blowfish-with-rpmlintrc/test.patch b/tests/fixtures/packages/blowfish-with-rpmlintrc/test.patch index 7ebeead2..26e7f763 100644 --- a/tests/fixtures/packages/blowfish-with-rpmlintrc/test.patch +++ b/tests/fixtures/packages/blowfish-with-rpmlintrc/test.patch @@ -1 +1,4 @@ -+- +--- README.txt ++++ README.txt +@@ -0,0 +1 @@ ++This works