From c51aa48e60103307307c7c40c2d046719def7054 Mon Sep 17 00:00:00 2001 From: Alex S Date: Fri, 9 Aug 2019 12:25:58 +0300 Subject: [PATCH] reverse proxy clients integration tests tesla reverse proxy client fixes --- lib/pleroma/reverse_proxy/client/tesla.ex | 14 ++++- test/reverse_proxy/client/hackney_test.exs | 7 +++ test/reverse_proxy/client/tesla_test.exs | 9 +++ test/{ => reverse_proxy}/reverse_proxy_test.exs | 4 ++ test/support/reverse_proxy_client_case.ex | 76 +++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 test/reverse_proxy/client/hackney_test.exs create mode 100644 test/reverse_proxy/client/tesla_test.exs rename test/{ => reverse_proxy}/reverse_proxy_test.exs (99%) create mode 100644 test/support/reverse_proxy_client_case.ex diff --git a/lib/pleroma/reverse_proxy/client/tesla.ex b/lib/pleroma/reverse_proxy/client/tesla.ex index 9b0be5bda..b1498a5a4 100644 --- a/lib/pleroma/reverse_proxy/client/tesla.ex +++ b/lib/pleroma/reverse_proxy/client/tesla.ex @@ -2,7 +2,6 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do @behaviour Pleroma.ReverseProxy.Client @adapters [Tesla.Adapter.Gun] - alias Pleroma.HTTP def request(method, url, headers, body, opts \\ []) do adapter_opts = @@ -10,8 +9,16 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do |> Keyword.put(:chunks_response, true) with {:ok, response} <- - HTTP.request(method, url, body, headers, Keyword.put(opts, :adapter, adapter_opts)) do - {:ok, response.status, response.headers, response.body} + Pleroma.HTTP.request( + method, + url, + body, + headers, + Keyword.put(opts, :adapter, adapter_opts) + ) do + if is_map(response.body), + do: {:ok, response.status, response.headers, response.body}, + else: {:ok, response.status, response.headers} else {:error, error} -> {:error, error} end @@ -23,6 +30,7 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do case read_chunk!(client) do {:fin, body} -> {:ok, body, Map.put(client, :fin, true)} {:nofin, part} -> {:ok, part, client} + {:error, error} -> {:error, error} end end diff --git a/test/reverse_proxy/client/hackney_test.exs b/test/reverse_proxy/client/hackney_test.exs new file mode 100644 index 000000000..577e0b0b2 --- /dev/null +++ b/test/reverse_proxy/client/hackney_test.exs @@ -0,0 +1,7 @@ +defmodule Pleroma.ReverseProxy.Client.HackneyTest do + use Pleroma.ReverseProxyClientCase, client: Pleroma.ReverseProxy.Client.Hackney + + defp check_ref(ref) do + assert is_reference(ref) + end +end diff --git a/test/reverse_proxy/client/tesla_test.exs b/test/reverse_proxy/client/tesla_test.exs new file mode 100644 index 000000000..029a25d0f --- /dev/null +++ b/test/reverse_proxy/client/tesla_test.exs @@ -0,0 +1,9 @@ +defmodule Pleroma.ReverseProxy.Client.TeslaTest do + use Pleroma.ReverseProxyClientCase, client: Pleroma.ReverseProxy.Client.Tesla + + defp check_ref(%{pid: pid, stream: stream} = ref) do + assert is_pid(pid) + assert is_reference(stream) + assert ref[:fin] + end +end diff --git a/test/reverse_proxy_test.exs b/test/reverse_proxy/reverse_proxy_test.exs similarity index 99% rename from test/reverse_proxy_test.exs rename to test/reverse_proxy/reverse_proxy_test.exs index 0644d1ed9..95adae666 100644 --- a/test/reverse_proxy_test.exs +++ b/test/reverse_proxy/reverse_proxy_test.exs @@ -329,4 +329,8 @@ defmodule Pleroma.ReverseProxyTest do assert {"content-disposition", "attachment; filename=\"filename.jpg\""} in conn.resp_headers end end + + describe "integration tests" do + @describetag :integration + end end diff --git a/test/support/reverse_proxy_client_case.ex b/test/support/reverse_proxy_client_case.ex new file mode 100644 index 000000000..40cd59ea2 --- /dev/null +++ b/test/support/reverse_proxy_client_case.ex @@ -0,0 +1,76 @@ +defmodule Pleroma.ReverseProxyClientCase do + defmacro __using__(client: client) do + quote do + use ExUnit.Case + @moduletag :integration + @client unquote(client) + + setup do + Application.put_env(:tesla, :adapter, Tesla.Adapter.Gun) + on_exit(fn -> Application.put_env(:tesla, :adapter, Tesla.Mock) end) + end + + test "get response body stream" do + {:ok, status, headers, ref} = + @client.request( + :get, + "http://httpbin.org/stream-bytes/10", + [{"accept", "application/octet-stream"}], + "", + [] + ) + + assert status == 200 + assert headers != [] + + {:ok, response, ref} = @client.stream_body(ref) + check_ref(ref) + assert is_binary(response) + assert byte_size(response) == 10 + + assert :done == @client.stream_body(ref) + end + + test "head response" do + {:ok, status, headers} = @client.request(:head, "http://httpbin.org/get", [], "", []) + + assert status == 200 + assert headers != [] + end + + test "get error response" do + case @client.request( + :get, + "http://httpbin.org/status/500", + [], + "", + [] + ) do + {:ok, status, headers, ref} -> + assert status == 500 + assert headers != [] + check_ref(ref) + + assert :ok = @client.close(ref) + + {:ok, status, headers} -> + assert headers != [] + end + end + + test "head error response" do + {:ok, status, headers} = + @client.request( + :head, + "http://httpbin.org/status/500", + [], + "", + [] + ) + + assert status == 500 + assert headers != [] + end + end + end +end