diff options
| author | lain <lain@soykaf.club> | 2023-12-07 05:26:06 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2023-12-07 05:26:06 +0000 |
| commit | 2656199dc73c3febe595f8d55e34e30c6a94e1f6 (patch) | |
| tree | 4bb9cc8c64e8e9542832767b0f4624693edeb51c | |
| parent | 6c10fd22a3c0b80335d1b1eda8440e2241fa0226 (diff) | |
| parent | 5dce39d17f7aede05f6326fbe3514bd9431f832c (diff) | |
| download | pleroma-2656199dc73c3febe595f8d55e34e30c6a94e1f6.tar.gz pleroma-2656199dc73c3febe595f8d55e34e30c6a94e1f6.zip | |
Merge branch 'more-test-fixes' into 'develop'
More test fixes
See merge request pleroma/pleroma!3984
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | changelog.d/loading-order-test-fix.skip | 0 | ||||
| -rw-r--r-- | lib/pleroma/docs/generator.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf.ex | 4 |
4 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff3308e31..10a843af2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: &global_variables POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres DB_HOST: postgres - DB_PORT: 5432 + DB_PORT: "5432" MIX_ENV: test workflow: diff --git a/changelog.d/loading-order-test-fix.skip b/changelog.d/loading-order-test-fix.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/loading-order-test-fix.skip diff --git a/lib/pleroma/docs/generator.ex b/lib/pleroma/docs/generator.ex index 6508f1947..456a8fd54 100644 --- a/lib/pleroma/docs/generator.ex +++ b/lib/pleroma/docs/generator.ex @@ -17,6 +17,8 @@ defmodule Pleroma.Docs.Generator do # This shouldn't be needed as all modules are expected to have module_info/1, # but in test enviroments some transient modules `:elixir_compiler_XX` # are loaded for some reason (where XX is a random integer). + Code.ensure_loaded(module) + if function_exported?(module, :module_info, 1) do module.module_info(:attributes) |> Keyword.get_values(:behaviour) diff --git a/lib/pleroma/web/activity_pub/mrf.ex b/lib/pleroma/web/activity_pub/mrf.ex index ff9f84497..69054e25b 100644 --- a/lib/pleroma/web/activity_pub/mrf.ex +++ b/lib/pleroma/web/activity_pub/mrf.ex @@ -54,6 +54,8 @@ defmodule Pleroma.Web.ActivityPub.MRF do @required_description_keys [:key, :related_policy] def filter_one(policy, message) do + Code.ensure_loaded(policy) + should_plug_history? = if function_exported?(policy, :history_awareness, 0) do policy.history_awareness() @@ -188,6 +190,8 @@ defmodule Pleroma.Web.ActivityPub.MRF do def config_descriptions(policies) do Enum.reduce(policies, @mrf_config_descriptions, fn policy, acc -> + Code.ensure_loaded(policy) + if function_exported?(policy, :config_description, 0) do description = @default_description |