From 1e6027cf3a554052b0691a52d407c93daed14828 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Mon, 15 Apr 2024 14:11:14 +0200 Subject: [PATCH] t: use -i flag with curl -X DELETE instead of -I to avoid curl bug --- lib/MirrorCache/WebAPI/Controller/Admin/Folder.pm | 2 +- t/environ/08-folder-delete-remote.sh | 8 ++++---- t/environ/08-folder-delete.sh | 4 ++-- t/lib/Dockerfile.systemd.mariadb | 2 +- t/lib/Dockerfile.systemd.postgresql | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/MirrorCache/WebAPI/Controller/Admin/Folder.pm b/lib/MirrorCache/WebAPI/Controller/Admin/Folder.pm index c5948d3d..338720d6 100644 --- a/lib/MirrorCache/WebAPI/Controller/Admin/Folder.pm +++ b/lib/MirrorCache/WebAPI/Controller/Admin/Folder.pm @@ -28,7 +28,7 @@ sub delete_cascade { sub { my ($self, $err, @result) = @_; return $c->render(text => $err, status => 500) if $err; - return $c->render(json => {text => 'ok'}); + return $c->render(text => 'Ok'); my $txkeep = $tx; } ); diff --git a/t/environ/08-folder-delete-remote.sh b/t/environ/08-folder-delete-remote.sh index fe0011b1..24b2419b 100755 --- a/t/environ/08-folder-delete-remote.sh +++ b/t/environ/08-folder-delete-remote.sh @@ -35,16 +35,16 @@ $mc/db/sql "select * from file" test 2 == $($mc/db/sql "select count(*) from folder_diff") test 1 == $($mc/db/sql "select count(*) from folder_diff_file") -$mc/curl --interface 127.0.0.2 -X DELETE -I /admin/folder_diff/1 +$mc/curl --interface 127.0.0.2 -X DELETE -i /admin/folder_diff/1 # check nothing was actually deleted test 2 == $($mc/db/sql "select count(*) from folder_diff") -$mc/curl --interface 127.0.0.2 -X DELETE -I -H 'x-forwarded-for: 127.0.0.1' /admin/folder_diff/1 -$mc/curl --interface 127.0.0.2 -X DELETE -I -H 'x-forwarded-for: 127.0.0.1' /admin/folder_diff/1 +$mc/curl --interface 127.0.0.2 -X DELETE -i -H 'x-forwarded-for: 127.0.0.1' /admin/folder_diff/1 +$mc/curl --interface 127.0.0.2 -X DELETE -i -H 'x-forwarded-for: 127.0.0.1' /admin/folder_diff/1 test 2 == $($mc/db/sql "select count(*) from folder_diff") # with 127.0.0.3 it actually works -$mc/curl --interface 127.0.0.3 -X DELETE -I /admin/folder_diff/1 +$mc/curl --interface 127.0.0.3 -X DELETE -i /admin/folder_diff/1 test 0 == $($mc/db/sql "select count(*) from folder_diff") diff --git a/t/environ/08-folder-delete.sh b/t/environ/08-folder-delete.sh index 4700663c..2abd739f 100755 --- a/t/environ/08-folder-delete.sh +++ b/t/environ/08-folder-delete.sh @@ -35,13 +35,13 @@ $mc/db/sql "select * from file" test 2 == $($mc/db/sql "select count(*) from folder_diff") test 1 == $($mc/db/sql "select count(*) from folder_diff_file") -$mc/curl -X DELETE -I /admin/folder_diff/1 +$mc/curl -X DELETE -i /admin/folder_diff/1 test 1 == $($mc/db/sql "select count(*) from folder") test 0 == $($mc/db/sql "select count(*) from folder_diff") test 0 == $($mc/db/sql "select count(*) from folder_diff_file") -$mc/curl -X DELETE -I /admin/folder/1 +$mc/curl -X DELETE -i /admin/folder/1 test 0 == $($mc/db/sql "select count(*) from file") test 0 == $($mc/db/sql "select count(*) from folder") diff --git a/t/lib/Dockerfile.systemd.mariadb b/t/lib/Dockerfile.systemd.mariadb index e8996742..281fb4a4 100644 --- a/t/lib/Dockerfile.systemd.mariadb +++ b/t/lib/Dockerfile.systemd.mariadb @@ -1,4 +1,4 @@ -FROM registry.opensuse.org/opensuse/leap:15.6 +FROM opensuse/leap:15.6 ENV container podman ENV LANG en_US.UTF-8 diff --git a/t/lib/Dockerfile.systemd.postgresql b/t/lib/Dockerfile.systemd.postgresql index c0ff4156..73a5df48 100644 --- a/t/lib/Dockerfile.systemd.postgresql +++ b/t/lib/Dockerfile.systemd.postgresql @@ -1,4 +1,4 @@ -FROM registry.opensuse.org/opensuse/leap:15.6 +FROM opensuse/leap:15.6 ENV container podman ENV LANG en_US.UTF-8