From: Christopher Date: Sun, 5 Apr 2020 01:46:22 +0000 (-0500) Subject: update wampex and client X-Git-Url: http://git.entropealabs.com/?a=commitdiff_plain;h=c33e32a35a05b8c2de48fe8251b2ed0f521b26ea;p=wampex_router.git update wampex and client --- diff --git a/mix.exs b/mix.exs index 27b7dcf..4c8fbc1 100644 --- a/mix.exs +++ b/mix.exs @@ -49,10 +49,10 @@ defmodule Wampex.Router.MixProject do {:msgpack, "~> 0.7.0"}, {:plug_cowboy, "~> 2.1"}, {:states_language, "~> 0.2"}, - {:wampex, git: "https://gitlab.com/entropealabs/wampex.git", tag: "61d834a784f5f14ec90508cf7556a5ebaec113c3"}, + {:wampex, git: "https://gitlab.com/entropealabs/wampex.git", tag: "7d656d9748cb0e4d08c625d87e315839afecb4b2"}, {:wampex_client, git: "https://gitlab.com/entropealabs/wampex_client.git", - tag: "909a70ec0475472d7fe2f567a851b9fcdf0f6ded", + tag: "7896d51d7493fd3477de2a226d7d97f2c3098736", only: [:dev, :test]} ] end diff --git a/mix.lock b/mix.lock index cdb2a51..ad675bf 100644 --- a/mix.lock +++ b/mix.lock @@ -36,8 +36,8 @@ "states_language": {:hex, :states_language, "0.2.8", "f9dfd3c0bd9a9d7bda25ef315f2d90944cd6b2022a7f3c403deb1d4ec451825e", [:mix], [{:elixpath, "~> 0.1.0", [hex: :elixpath, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:json_xema, "~> 0.4.0", [hex: :json_xema, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:xema, "~> 0.11.0", [hex: :xema, repo: "hexpm", optional: false]}], "hexpm", "a5231691e7cb37fe32dc7de54c2dc86d1d60e84c4f0379f3246e55be2a85ec78"}, "telemetry": {:hex, :telemetry, "0.4.1", "ae2718484892448a24470e6aa341bc847c3277bfb8d4e9289f7474d752c09c7f", [:rebar3], [], "hexpm", "4738382e36a0a9a2b6e25d67c960e40e1a2c95560b9f936d8e29de8cd858480f"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm", "1d1848c40487cdb0b30e8ed975e34e025860c02e419cb615d255849f3427439d"}, - "wampex": {:git, "https://gitlab.com/entropealabs/wampex.git", "61d834a784f5f14ec90508cf7556a5ebaec113c3", [tag: "61d834a784f5f14ec90508cf7556a5ebaec113c3"]}, - "wampex_client": {:git, "https://gitlab.com/entropealabs/wampex_client.git", "909a70ec0475472d7fe2f567a851b9fcdf0f6ded", [tag: "909a70ec0475472d7fe2f567a851b9fcdf0f6ded"]}, + "wampex": {:git, "https://gitlab.com/entropealabs/wampex.git", "7d656d9748cb0e4d08c625d87e315839afecb4b2", [tag: "7d656d9748cb0e4d08c625d87e315839afecb4b2"]}, + "wampex_client": {:git, "https://gitlab.com/entropealabs/wampex_client.git", "7896d51d7493fd3477de2a226d7d97f2c3098736", [tag: "7896d51d7493fd3477de2a226d7d97f2c3098736"]}, "websockex": {:hex, :websockex, "0.4.2", "9a3b7dc25655517ecd3f8ff7109a77fce94956096b942836cdcfbc7c86603ecc", [:mix], [], "hexpm", "803cd76e91544b56f0e655e36790be797fa6436db9224f7c303db9b9df2a3df4"}, "xema": {:hex, :xema, "0.11.0", "7b5118418633cffc27092110d02d4faeea938149dd3f6c64299e41e747067e80", [:mix], [{:conv_case, "~> 0.2.2", [hex: :conv_case, repo: "hexpm", optional: false]}, {:decimal, "~> 1.7", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "51491c9a953d65069d4b30aa2f70bc45ff99fd1bc3345bc72ce4e644d01ea14e"}, } diff --git a/test/wampex_test.exs b/test/wampex_test.exs index 6c1687f..e1647f3 100644 --- a/test/wampex_test.exs +++ b/test/wampex_test.exs @@ -44,7 +44,7 @@ defmodule WampexTest do @tag :client test "callee registration" do name = TestCalleeRegistration - Client.start_link(name: name, session: @session) + Client.start_link(name: name, session: @session, reconnect: false) TestCallee.start_link(self(), name, @device) assert_receive {:registered, id} end @@ -53,7 +53,7 @@ defmodule WampexTest do test "abort" do Process.flag(:trap_exit, true) callee_name = TestAbort - {:ok, pid} = Client.start_link(name: callee_name, session: @session) + {:ok, pid} = Client.start_link(name: callee_name, session: @session, reconnect: false) Client.cast(callee_name, Peer.hello(%Hello{realm: "test", roles: [Callee]})) assert_receive {:EXIT, ^pid, :shutdown}, 1000 end @@ -61,7 +61,7 @@ defmodule WampexTest do @tag :client test "caller receives error when calling unknown procedure" do caller_name = TestExistCaller - Client.start_link(name: caller_name, session: @session) + Client.start_link(name: caller_name, session: @session, reconnect: false) assert %Error{error: "wamp.error.no_registration"} = Client.call( @@ -77,11 +77,11 @@ defmodule WampexTest do @tag :client test "caller receives error when callee returns an error" do callee_name = TestErrorCalleeRespond - Client.start_link(name: callee_name, session: @session) + Client.start_link(name: callee_name, session: @session, reconnect: false) TestCallee.start_link(self(), callee_name, @device) assert_receive {_, _} caller_name = TestErrorCaller - Client.start_link(name: caller_name, session: @session) + Client.start_link(name: caller_name, session: @session, reconnect: false) assert %Error{error: "this.is.an.error", arg_list: [1], arg_kw: %{"color" => "#FFFFFF"}} = Client.call( @@ -97,11 +97,11 @@ defmodule WampexTest do @tag :client test "callee is invoked and responds and caller gets result" do callee_name = TestCalleeRespond - Client.start_link(name: callee_name, session: @session) + Client.start_link(name: callee_name, session: @session, reconnect: false) TestCallee.start_link(self(), callee_name, @device) assert_receive {_, _} caller_name = TestCaller - Client.start_link(name: caller_name, session: @session) + Client.start_link(name: caller_name, session: @session, reconnect: false) assert %Result{arg_list: ["ok"], arg_kw: %{"color" => "#FFFFFF"}} = Client.call( @@ -119,7 +119,7 @@ defmodule WampexTest do @tag :client test "subscriber registration" do name = TestSubscriberRegister - Client.start_link(name: name, session: @session) + Client.start_link(name: name, session: @session, reconnect: false) TestSubscriber.start_link(self(), name, "com.data.temp") assert_receive {:subscribed, id} end @@ -127,11 +127,11 @@ defmodule WampexTest do @tag :client test "subscriber receives events from publisher" do name = TestSubscriberEvents - Client.start_link(name: name, session: @session) + Client.start_link(name: name, session: @session, reconnect: false) TestSubscriber.start_link(self(), name, "com.data.test.temp") assert_receive {:subscribed, id} - Client.start_link(name: TestPublisher, session: @session) + Client.start_link(name: TestPublisher, session: @session, reconnect: false) Client.publish( TestPublisher,