Merge remote-tracking branch 'origin/add-timeout-support' into pooling

3 files changed, 27 insertions, 3 deletions

diff --git a/test/lib/powerdnsex/config_test.exs b/test/lib/powerdnsex/config_test.exs
index eca2e03..c8649ae 100644
--- a/test/lib/powerdnsex/config_test.exs
+++ b/test/lib/powerdnsex/config_test.exs
@@ -1,10 +1,11 @@
 defmodule PowerDNSex.ConfigTest do
-  use ExUnit.Case, async: true
+  use ExUnit.Case, async: false
 
   alias PowerDNSex.FakeConfig, as: Config
 
   setup do: Config.set_url()
   setup do: Config.set_token()
+  setup do: Config.set_timeout()
   setup do: Config.set_url() && Config.set_token()
 
   describe "Config.powerdns_token/0" do
@@ -56,4 +57,23 @@ defmodule PowerDNSex.ConfigTest do
       end
     end
   end
+
+  describe "Config.powerdns_timeout/0" do
+    @tag :configs
+    test "using application config" do
+      assert PowerDNSex.Config.powerdns_timeout() == :timer.seconds(Config.timeout())
+    end
+
+    @tag :configs
+    test "uses default timeout" do
+      existing = Application.get_env(:powerdnsex, :timeout)
+      on_exit fn ->
+        Application.put_env(:powerdnsex, :timeout, existing)
+      end
+
+      Application.delete_env(:powerdnsex, :timeout)
+
+      assert PowerDNSex.Config.powerdns_timeout() == :timer.seconds(60)
+    end
+  end
 end
diff --git a/test/lib/powerdnsex/powerdnsex_test.exs b/test/lib/powerdnsex/powerdnsex_test.exs
index 92e7f91..42c3dfd 100644
--- a/test/lib/powerdnsex/powerdnsex_test.exs
+++ b/test/lib/powerdnsex/powerdnsex_test.exs
@@ -3,8 +3,8 @@ defmodule PowerDNSexTest do
   use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
 
   setup do
-    Config.set_url()
-    Config.set_token()
+    PowerDNSex.FakeConfig.set_url()
+    PowerDNSex.FakeConfig.set_token()
 
     ExVCR.Config.cassette_library_dir(
       "test/support/cassettes",
diff --git a/test/support/fake_config.exs b/test/support/fake_config.exs
index c8f4f60..e05db22 100644
--- a/test/support/fake_config.exs
+++ b/test/support/fake_config.exs
@@ -1,10 +1,14 @@
 defmodule PowerDNSex.FakeConfig do
   @app_config_token "S3cr37_70k3n"
   @app_config_url "https://my-powerdns.api"
+  @app_config_timeout 42
 
   def set_url, do: Application.put_env(:powerdnsex, :url, @app_config_url)
   def set_token, do: Application.put_env(:powerdnsex, :token, @app_config_token)
+  def set_timeout, do: Application.put_env(:powerdnsex, :timeout, @app_config_timeout)
+
 
   def token, do: @app_config_token
   def url, do: @app_config_url
+  def timeout, do: @app_config_timeout
 end