X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=config%2Ftest.exs;h=87396a88dbfe98e0764db7817c54476eb9c48ddb;hb=f930e83fa2a7e2184ca6bd09773d81568e7c755c;hp=e482f38c8055ad767470e46539dbca8f14d92350;hpb=8b28dce82ac244c6c5e67d8379e68e5742bfe875;p=akkoma

diff --git a/config/test.exs b/config/test.exs
index e482f38c8..87396a88d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -38,7 +38,7 @@ config :pleroma, :instance,
   external_user_synchronization: false,
   static_dir: "test/instance_static/"
 
-config :pleroma, :activitypub, sign_object_fetches: false
+config :pleroma, :activitypub, sign_object_fetches: false, follow_handshake_timeout: 0
 
 # Configure your database
 config :pleroma, Pleroma.Repo,
@@ -53,7 +53,7 @@ config :pleroma, Pleroma.Repo,
 config :pleroma, :dangerzone, override_repo_pool_size: true
 
 # Reduce hash rounds for testing
-config :pbkdf2_elixir, rounds: 1
+config :pleroma, :password, iterations: 1
 
 config :tesla, adapter: Tesla.Mock
 
@@ -115,10 +115,6 @@ config :pleroma, Pleroma.Web.Plugs.RemoteIp, enabled: false
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
-config :pleroma, Pleroma.Uploaders.S3,
-  bucket: nil,
-  streaming_enabled: true
-
 config :tzdata, :autoupdate, :disabled
 
 config :pleroma, :mrf, policies: []