summaryrefslogtreecommitdiff
path: root/test/test_helper.exs
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-07-24 02:42:28 +0300
committerMaxim Filippov <colixer@gmail.com>2019-07-24 02:42:28 +0300
commitf46805bb40bf29cd67acb33b6b65ed1e4e28d3e1 (patch)
tree7542dbbe178183e4dd3c3451aa7744f18117fa37 /test/test_helper.exs
parent03471151d6089e318abaf5265d42ffedf7a5b902 (diff)
parent1a751529fb2cd3929e3373a908bec5db5cc32f1b (diff)
downloadpleroma-f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1.tar.gz
pleroma-f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1.zip
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'test/test_helper.exs')
-rw-r--r--test/test_helper.exs3
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)