From f3edbf3593ee7e5a0eee86533178886afd3d3ffa Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 20 Oct 2021 10:23:43 -0400 Subject: [PATCH] gating-test.patch merged upstream Signed-off-by: Lokesh Mandvekar --- gating-test.patch | 27 --------------------------- podman.spec | 1 - 2 files changed, 28 deletions(-) delete mode 100644 gating-test.patch diff --git a/gating-test.patch b/gating-test.patch deleted file mode 100644 index e4514a5..0000000 --- a/gating-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fb2355adb3ce4de72d36830f608fb188c18d1981 Mon Sep 17 00:00:00 2001 -From: Ed Santiago -Date: Fri, 1 Oct 2021 05:23:16 -0600 -Subject: [PATCH] Gating tests: fix permissions error - -...in volume test. Looks like Bodhi gating tests run from a -nonwritable directory. I feel really stupid for not realizing -this when I first tried to fix this bug two weeks ago. - -Signed-off-by: Ed Santiago ---- - test/system/160-volumes.bats | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats -index b48198a1899..c02525e0d3b 100644 ---- a/test/system/160-volumes.bats -+++ b/test/system/160-volumes.bats -@@ -191,7 +191,7 @@ EOF - run_podman run --rm -v my_vol:/data $IMAGE sh -c "echo hello >> /data/test" - run_podman volume create my_vol2 - -- tarfile=hello$(random_string | tr A-Z a-z).tar -+ tarfile=${PODMAN_TMPDIR}/hello$(random_string | tr A-Z a-z).tar - run_podman volume export my_vol --output=$tarfile - # we want to use `run_podman volume export my_vol` but run_podman is wrapping EOF - run_podman volume import my_vol2 - < $tarfile diff --git a/podman.spec b/podman.spec index ffdafda..984af9b 100644 --- a/podman.spec +++ b/podman.spec @@ -76,7 +76,6 @@ Source0: %{git0}/archive/%{built_tag}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz Source3: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz -Patch0: gating-test.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} %if 0%{?fedora} && ! 0%{?rhel} BuildRequires: btrfs-progs-devel