Try to use different sessions in Examples.SessionTest

lib/zenohex.ex

@@ -17,8 +17,8 @@ defmodule Zenohex do
   """
   @spec open(Config.t()) :: {:ok, Session.t()} | {:error, reason :: any()}
   def open(config \\ %Config{}) do
-    if System.get_env("SCOUTING_DELAY") == "0" do
-      Nif.zenoh_open(%Config{scouting: %Scouting{delay: 0}})
+    if delay = System.get_env("SCOUTING_DELAY") do
+      Nif.zenoh_open(%Config{scouting: %Scouting{delay: String.to_integer(delay)}})
     else
       Nif.zenoh_open(config)
     end

lib/zenohex/examples/publisher.ex

@@ -50,7 +50,7 @@ defmodule Zenohex.Examples.Publisher do
   Start Publisher.
   """
   def start_link(args \\ %{}) when is_map(args) do
-    session = Map.get(args, :session, Zenohex.open!())
+    session = Map.get(args, :session) || Zenohex.open!()
     key_expr = Map.get(args, :key_expr, "zenohex/examples/pub")
     Supervisor.start_link(__MODULE__, %{session: session, key_expr: key_expr}, name: __MODULE__)
   end

lib/zenohex/examples/pull_subscriber.ex

@@ -46,7 +46,7 @@ defmodule Zenohex.Examples.PullSubscriber do
   Start PullSubscriber.
   """
   def start_link(args \\ %{}) when is_map(args) do
-    session = Map.get(args, :session, Zenohex.open!())
+    session = Map.get(args, :session) || Zenohex.open!()
     key_expr = Map.get(args, :key_expr, "zenohex/examples/**")
     callback = Map.get(args, :callback, &Logger.debug(inspect(&1)))
 

lib/zenohex/examples/queryable.ex

@@ -44,7 +44,7 @@ defmodule Zenohex.Examples.Queryable do
   Start Queryable.
   """
   def start_link(args \\ %{}) when is_map(args) do
-    session = Map.get(args, :session, Zenohex.open!())
+    session = Map.get(args, :session) || Zenohex.open!()
     key_expr = Map.get(args, :key_expr, "zenohex/examples/**")
     callback = Map.get(args, :callback, &Logger.debug(inspect(&1)))
 

lib/zenohex/examples/queryable/impl.ex

@@ -20,12 +20,18 @@ defmodule Zenohex.Examples.Queryable.Impl do
     {:ok, queryable} = Session.declare_queryable(session, key_expr)
     state = %{queryable: queryable, callback: callback}
 
-    send(self(), :loop)
+    recv_timeout(state)
 
     {:ok, state}
   end
 
   def handle_info(:loop, state) do
+    recv_timeout(state)
+
+    {:noreply, state}
+  end
+
+  def recv_timeout(state) do
     case Queryable.recv_timeout(state.queryable) do
       {:ok, query} ->
         state.callback.(query)
@@ -37,7 +43,5 @@ defmodule Zenohex.Examples.Queryable.Impl do
       {:error, error} ->
         Logger.error(inspect(error))
     end
-
-    {:noreply, state}
   end
 end

lib/zenohex/examples/session.ex

@@ -50,14 +50,10 @@ defmodule Zenohex.Examples.Session do
   Start Session.
   """
   def start_link(args \\ %{}) when is_map(args) do
-    session = Map.get(args, :session, Zenohex.open!())
+    session = Map.get(args, :session) || Zenohex.open!()
     Supervisor.start_link(__MODULE__, %{session: session}, name: __MODULE__)
   end
 
-  @doc "Get session."
-  @spec session() :: Zenohex.Session.t()
-  defdelegate session(), to: Session.Impl
-
   @doc "Put data."
   @spec put(String.t(), integer() | float() | binary()) :: :ok
   defdelegate put(key_expr, value), to: Session.Impl

lib/zenohex/examples/session/impl.ex

@@ -9,10 +9,6 @@ defmodule Zenohex.Examples.Session.Impl do
     GenServer.start_link(__MODULE__, args, name: __MODULE__)
   end
 
-  def session() do
-    GenServer.call(__MODULE__, :session)
-  end
-
   def put(key_expr, value) do
     GenServer.call(__MODULE__, {:put, key_expr, value})
   end
@@ -40,10 +36,6 @@ defmodule Zenohex.Examples.Session.Impl do
      }}
   end
 
-  def handle_call(:session, _from, state) do
-    {:reply, state.session, state}
-  end
-
   def handle_call({:put, key_expr, value}, _from, state) do
     ret = Zenohex.Session.put(state.session, key_expr, value)
     {:reply, ret, state}

lib/zenohex/examples/storage.ex

@@ -56,7 +56,7 @@ defmodule Zenohex.Examples.Storage do
   Start storage.
   """
   def start_link(args \\ %{}) when is_map(args) do
-    session = Map.get(args, :session, Zenohex.open!())
+    session = Map.get(args, :session) || Zenohex.open!()
     key_expr = Map.get(args, :key_expr, "zenohex/examples/**")
     Supervisor.start_link(__MODULE__, %{session: session, key_expr: key_expr}, name: __MODULE__)
   end

lib/zenohex/examples/subscriber.ex

@@ -44,7 +44,7 @@ defmodule Zenohex.Examples.Subscriber do
   Start Subscriber.
   """
   def start_link(args \\ %{}) when is_map(args) do
-    session = Map.get(args, :session, Zenohex.open!())
+    session = Map.get(args, :session) || Zenohex.open!()
     key_expr = Map.get(args, :key_expr, "zenohex/examples/**")
     callback = Map.get(args, :callback, &Logger.debug(inspect(&1)))
 

lib/zenohex/examples/subscriber/impl.ex

@@ -20,12 +20,17 @@ defmodule Zenohex.Examples.Subscriber.Impl do
     {:ok, subscriber} = Session.declare_subscriber(session, key_expr)
     state = %{subscriber: subscriber, callback: callback}
 
-    send(self(), :loop)
+    recv_timeout(state)
 
     {:ok, state}
   end
 
   def handle_info(:loop, state) do
+    recv_timeout(state)
+    {:noreply, state}
+  end
+
+  defp recv_timeout(state) do
     case Subscriber.recv_timeout(state.subscriber) do
       {:ok, sample} ->
         state.callback.(sample)
@@ -37,7 +42,5 @@ defmodule Zenohex.Examples.Subscriber.Impl do
       {:error, error} ->
         Logger.error(inspect(error))
     end
-
-    {:noreply, state}
   end
 end

mix.exs

@@ -111,14 +111,13 @@ defmodule Zenohex.MixProject do
       """
       =================================================================
       HEY, ZENOHEX DEVELOPER. TO REDUCE TESTING TIME,
-      WE COMPILE WITH API_OPEN_SESSION_DELAY=0 AND SET SCOUTING DELAY 0
+      WE COMPILE WITH API_OPEN_SESSION_DELAY=0
       =================================================================
       """
       |> String.trim_trailing()
       |> Mix.shell().info()
 
     :ok = System.put_env("API_OPEN_SESSION_DELAY", "0")
-    :ok = System.put_env("SCOUTING_DELAY", "0")
 
     Mix.Task.run("compile", ["--force"])
   end

test/zenohex/examples/session_test.exs

@@ -6,18 +6,15 @@ defmodule Zenohex.Examples.SessionTest do
   alias Zenohex.Examples.Queryable
   alias Zenohex.Query
   alias Zenohex.Sample
+  alias Zenohex.Config
+  alias Zenohex.Config.Scouting
 
   setup do
-    start_supervised!({Session, %{}})
+    start_supervised!(
+      {Session, %{session: Zenohex.open!(%Config{scouting: %Scouting{delay: 0}})}}
+    )
 
-    # NOTE: Use the same session for Subscriber or Queryable, to run unit tests even if you only have a loopback interface.
-    #
-    #       - If you only have a loopback interface(lo), the test will always fail if you use different sessions.
-    #         Because the peer cannot scout the another peer on lo.
-    #       - Even if you have a network interface other than loopback,
-    #         using different sessions may cause the test to fail depending on the scouting.
-
-    %{session: Session.session()}
+    %{session: Zenohex.open!(%Config{scouting: %Scouting{delay: 30}})}
   end
 
   describe "put/2" do