Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index 04136e1f23d1447bf94d278484c48c3110cfb74b..0c73f892ac987351ed6183b1a7ebd642bffeaabb 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,8 +9,7 @@ config :pleroma, Pleroma.Web.Endpoint,
 # Print only warnings and errors during test
 config :logger, level: :warn
 
-config :pleroma, Pleroma.Upload,
-  uploads: "test/uploads"
+config :pleroma, Pleroma.Upload, uploads: "test/uploads"
 
 # Configure your database
 config :pleroma, Pleroma.Repo,
@@ -18,13 +17,21 @@ config :pleroma, Pleroma.Repo,
   username: "postgres",
   password: "postgres",
   database: "pleroma_test",
-  hostname: "localhost",
+  hostname: System.get_env("DB_HOST") || "localhost",
   pool: Ecto.Adapters.SQL.Sandbox
 
-
 # Reduce hash rounds for testing
 config :comeonin, :pbkdf2_rounds, 1
 
 config :pleroma, :websub, Pleroma.Web.WebsubMock
 config :pleroma, :ostatus, Pleroma.Web.OStatusMock
 config :pleroma, :httpoison, HTTPoisonMock
+
+try do
+  import_config "test.secret.exs"
+rescue
+  _ ->
+    IO.puts(
+      "You may want to create test.secret.exs to declare custom database connection parameters."
+    )
+end