summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-07-02 21:28:15 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-07-02 21:28:15 +0000
commit02629169782b61f201a210169d13890ce05d889d (patch)
tree1e97fd54558da3bf81a3c39c0a3f512e675f3361
parenta31a4c522f467d3a369bfe8b71d3d381ec5b6127 (diff)
parent8bc51288be21f3b04d74504dc0c7d5a7ac6aa0e3 (diff)
downloadpleroma-02629169782b61f201a210169d13890ce05d889d.tar.gz
pleroma-02629169782b61f201a210169d13890ce05d889d.zip
Merge branch 'testfix/system-config-use' into 'develop'
release_runtime_provider_test: Explicitely use non-existant config file See merge request pleroma/pleroma!3910
-rw-r--r--changelog.d/testfix-system-config-use.skip0
-rw-r--r--test/pleroma/config/release_runtime_provider_test.exs2
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/testfix-system-config-use.skip b/changelog.d/testfix-system-config-use.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/testfix-system-config-use.skip
diff --git a/test/pleroma/config/release_runtime_provider_test.exs b/test/pleroma/config/release_runtime_provider_test.exs
index 4e0d4c838..e6d10b13e 100644
--- a/test/pleroma/config/release_runtime_provider_test.exs
+++ b/test/pleroma/config/release_runtime_provider_test.exs
@@ -10,7 +10,7 @@ defmodule Pleroma.Config.ReleaseRuntimeProviderTest do
describe "load/2" do
test "loads release defaults config and warns about non-existent runtime config" do
ExUnit.CaptureIO.capture_io(fn ->
- merged = ReleaseRuntimeProvider.load([], [])
+ merged = ReleaseRuntimeProvider.load([], config_path: "/var/empty/config.exs")
assert merged == Pleroma.Config.Holder.release_defaults()
end) =~
"!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file"