diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-21 16:55:28 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-21 16:55:28 +0300 |
| commit | 3908a80ac9ec5c05328af1b873dfeda20861c935 (patch) | |
| tree | 7a20162e1021702ade399d0e0417d3857400c78b /test | |
| parent | Set 'sql_pool_size' to 1 for sqlite tests (diff) | |
| parent | Fix elixir tests (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to 'test')
| -rw-r--r-- | test/acl_test.exs | 2 | ||||
| -rw-r--r-- | test/ejabberd_commands_mock_test.exs | 2 | ||||
| -rw-r--r-- | test/ejabberd_cyrsasl_test.exs | 2 | ||||
| -rw-r--r-- | test/jid_test.exs | 1 | ||||
| -rw-r--r-- | test/mod_admin_extra_test.exs | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/test/acl_test.exs b/test/acl_test.exs index 4bd8e698..0ab92ade 100644 --- a/test/acl_test.exs +++ b/test/acl_test.exs @@ -25,7 +25,7 @@ defmodule ACLTest do setup_all do :ok = :mnesia.start - :ok = :jid.start + {:ok, _} = :jid.start :stringprep.start :ok = :ejabberd_config.start(["domain1", "domain2"], []) :ok = :acl.start diff --git a/test/ejabberd_commands_mock_test.exs b/test/ejabberd_commands_mock_test.exs index 419a989d..12444f79 100644 --- a/test/ejabberd_commands_mock_test.exs +++ b/test/ejabberd_commands_mock_test.exs @@ -48,7 +48,7 @@ defmodule EjabberdCommandsMockTest do _ -> :ok end :mnesia.start - :ok = :jid.start + {:ok, _} = :jid.start :ok = :ejabberd_config.start(["domain1", "domain2"], []) {:ok, _} = :ejabberd_access_permissions.start_link() :ok = :acl.start diff --git a/test/ejabberd_cyrsasl_test.exs b/test/ejabberd_cyrsasl_test.exs index b85be0f8..1b98048c 100644 --- a/test/ejabberd_cyrsasl_test.exs +++ b/test/ejabberd_cyrsasl_test.exs @@ -27,7 +27,7 @@ defmodule EjabberdCyrsaslTest do :p1_sha.load_nif() :mnesia.start :ok = start_module(:stringprep) - :ok = start_module(:jid) + {:ok, _} = start_module(:jid) :ok = :ejabberd_config.start(["domain1"], []) :ok = :cyrsasl.start cyrstate = :cyrsasl.server_new("domain1", "domain1", "domain1", :ok, &get_password/1, diff --git a/test/jid_test.exs b/test/jid_test.exs index b75a3603..7d063b70 100644 --- a/test/jid_test.exs +++ b/test/jid_test.exs @@ -29,6 +29,7 @@ defmodule JidTest do setup_all do :stringprep.start :jid.start + :ok end test "create a jid from a binary" do diff --git a/test/mod_admin_extra_test.exs b/test/mod_admin_extra_test.exs index fde66f03..3baf4922 100644 --- a/test/mod_admin_extra_test.exs +++ b/test/mod_admin_extra_test.exs @@ -38,7 +38,7 @@ defmodule EjabberdModAdminExtraTest do setup_all do try do - :jid.start + :jid.start :stringprep.start :mnesia.start :p1_sha.load_nif |