diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-22 19:54:22 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-22 19:54:22 +0000 |
| commit | a042a7ac6d65dca3e19e6c4ddd65d2010e94aeba (patch) | |
| tree | 7cbef566f06d1cd23f15329eda49263559c36ba9 /test/test_helper.exs | |
| parent | 2951714429f3ea2d6aef81cbe8edc3dcd6dff6e6 (diff) | |
| parent | 9340896c9ee43dff26e6f11c417e4f6dccdd13de (diff) | |
| download | pleroma-a042a7ac6d65dca3e19e6c4ddd65d2010e94aeba.tar.gz pleroma-a042a7ac6d65dca3e19e6c4ddd65d2010e94aeba.zip | |
Merge branch 'tests/skip-some-tests-on-mac' into 'develop'
Exclude tests that use :crypt.crypt/2 on macOS
See merge request pleroma/pleroma!1470
Diffstat (limited to 'test/test_helper.exs')
| -rw-r--r-- | test/test_helper.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_helper.exs b/test/test_helper.exs index 3e33f0335..a927b2c3d 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -2,7 +2,8 @@ # Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only -ExUnit.start() +os_exclude = if :os.type() == {:unix, :darwin}, do: [skip_on_mac: true], else: [] +ExUnit.start(exclude: os_exclude) Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual) Mox.defmock(Pleroma.ReverseProxy.ClientMock, for: Pleroma.ReverseProxy.Client) {:ok, _} = Application.ensure_all_started(:ex_machina) |