25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

Merge branch 'master' of github.com:processone/ejabberd

This commit is contained in:
Evgeniy Khramtsov 2016-11-21 16:55:28 +03:00
commit 3908a80ac9
5 changed files with 5 additions and 4 deletions

View File

@ -25,7 +25,7 @@ defmodule ACLTest do
setup_all do setup_all do
:ok = :mnesia.start :ok = :mnesia.start
:ok = :jid.start {:ok, _} = :jid.start
:stringprep.start :stringprep.start
:ok = :ejabberd_config.start(["domain1", "domain2"], []) :ok = :ejabberd_config.start(["domain1", "domain2"], [])
:ok = :acl.start :ok = :acl.start

View File

@ -48,7 +48,7 @@ defmodule EjabberdCommandsMockTest do
_ -> :ok _ -> :ok
end end
:mnesia.start :mnesia.start
:ok = :jid.start {:ok, _} = :jid.start
:ok = :ejabberd_config.start(["domain1", "domain2"], []) :ok = :ejabberd_config.start(["domain1", "domain2"], [])
{:ok, _} = :ejabberd_access_permissions.start_link() {:ok, _} = :ejabberd_access_permissions.start_link()
:ok = :acl.start :ok = :acl.start

View File

@ -27,7 +27,7 @@ defmodule EjabberdCyrsaslTest do
:p1_sha.load_nif() :p1_sha.load_nif()
:mnesia.start :mnesia.start
:ok = start_module(:stringprep) :ok = start_module(:stringprep)
:ok = start_module(:jid) {:ok, _} = start_module(:jid)
:ok = :ejabberd_config.start(["domain1"], []) :ok = :ejabberd_config.start(["domain1"], [])
:ok = :cyrsasl.start :ok = :cyrsasl.start
cyrstate = :cyrsasl.server_new("domain1", "domain1", "domain1", :ok, &get_password/1, cyrstate = :cyrsasl.server_new("domain1", "domain1", "domain1", :ok, &get_password/1,

View File

@ -29,6 +29,7 @@ defmodule JidTest do
setup_all do setup_all do
:stringprep.start :stringprep.start
:jid.start :jid.start
:ok
end end
test "create a jid from a binary" do test "create a jid from a binary" do