diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-04 13:23:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-04 13:23:01 +0000 |
| commit | a553ed542774891b6b0b7a57372a2c0300bbe2ba (patch) | |
| tree | e67eab56a7cac2b2088df44a83e901d9b8d8c10c /test | |
| parent | 70d18a278c76e5681543a21150884f9e5dfcd097 (diff) | |
| parent | 1e6aa101688e157c9df7ff39aad9acf2fb44fec6 (diff) | |
| download | pleroma-a553ed542774891b6b0b7a57372a2c0300bbe2ba.tar.gz | |
Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'
Remove in-db configuration references from 1.1
See merge request pleroma/pleroma!1781
Diffstat (limited to 'test')
| -rw-r--r-- | test/tasks/instance_test.exs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/tasks/instance_test.exs b/test/tasks/instance_test.exs index 70986374e..4a532801a 100644 --- a/test/tasks/instance_test.exs +++ b/test/tasks/instance_test.exs @@ -41,8 +41,6 @@ defmodule Pleroma.InstanceTest do "dbpass", "--indexable", "y", - "--db-configurable", - "y", "--rum", "y", "--listen-port", @@ -69,7 +67,6 @@ defmodule Pleroma.InstanceTest do assert generated_config =~ "database: \"dbname\"" assert generated_config =~ "username: \"dbuser\"" assert generated_config =~ "password: \"dbpass\"" - assert generated_config =~ "dynamic_configuration: true" assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]" assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql() end |