[dubbo-erlang] branch 0.4.0 updated: fixed common test error

[dl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dlive pushed a commit to branch 0.4.0
in repository https://gitbox.apache.org/repos/asf/dubbo-erlang.git


The following commit(s) were added to refs/heads/0.4.0 by this push:
     new f0bf043  fixed common test error
f0bf043 is described below

commit f0bf04323a653dd06be0a7c94f3e9c9081f3bcb7
Author: DLive <xs...@163.com>
AuthorDate: Thu Jul 25 16:08:19 2019 +0800

    fixed common test error
---
 config_example/sys.config          | 2 +-
 src/dubbo_directory.erl            | 6 ++----
 src/dubbo_registry_zookeeper.erl   | 1 +
 test/consumer_SUITE.erl            | 1 +
 test/dubbo_config_parser_tests.erl | 9 +++++----
 test/reference_config_SUITE.erl    | 1 +
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config_example/sys.config b/config_example/sys.config
index c26fc54..de72b4a 100644
--- a/config_example/sys.config
+++ b/config_example/sys.config
@@ -23,7 +23,7 @@
         {serialization,hessian},
         {protocol, {dubbo, [{port, 20882}]}},
         {consumer,[
-%%            {<<"org.apache.dubbo.erlang.sample.service.facade.UserOperator">>,[]}
+            {<<"org.apache.dubbo.erlang.sample.service.facade.UserOperator">>,[]}
         ]},
         {provider,[
             {dubbo_service_user_impl,userOperator,<<"org.apache.dubbo.erlang.sample.service.facade.UserOperator">>,[]}
diff --git a/src/dubbo_directory.erl b/src/dubbo_directory.erl
index 4945237..cec107b 100644
--- a/src/dubbo_directory.erl
+++ b/src/dubbo_directory.erl
@@ -121,10 +121,8 @@ refresh_invoker([Url | Rest], Acc) ->
     case dubbo_extension:run_fold(protocol, refer, [Url], undefined) of
         undefined ->
             refresh_invoker(Rest, Acc);
-        {ok, Invoker} ->
-            refresh_invoker(Rest, [Invoker | Acc]);
-        {stop, _} ->
-            refresh_invoker(Rest, Acc)
+        Invoker ->
+            refresh_invoker(Rest, [Invoker | Acc])
     end.
 
 pick_interface([Url | _]) ->
diff --git a/src/dubbo_registry_zookeeper.erl b/src/dubbo_registry_zookeeper.erl
index 915bb71..e7e1862 100644
--- a/src/dubbo_registry_zookeeper.erl
+++ b/src/dubbo_registry_zookeeper.erl
@@ -89,6 +89,7 @@ init([]) ->
     {stop, Reason :: term(), Reply :: term(), NewState :: #state{}} |
     {stop, Reason :: term(), NewState :: #state{}}).
 handle_call({do_register, Url}, _From, State) ->
+    io:format(user,"debug do_register ~p~n",[Url]),
     do_register(State#state.zk_pid, Url),
     {reply, ok, State};
 handle_call({do_unregister, Url}, _From, State) ->
diff --git a/test/consumer_SUITE.erl b/test/consumer_SUITE.erl
index ef1fe19..29eaa34 100644
--- a/test/consumer_SUITE.erl
+++ b/test/consumer_SUITE.erl
@@ -54,6 +54,7 @@ init_per_suite(Config) ->
 %% Config0 = Config1 = [tuple()]
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
+    application:stop(dubboerl),
     ok.
 
 %%--------------------------------------------------------------------
diff --git a/test/dubbo_config_parser_tests.erl b/test/dubbo_config_parser_tests.erl
index 060d4f5..beb0024 100644
--- a/test/dubbo_config_parser_tests.erl
+++ b/test/dubbo_config_parser_tests.erl
@@ -19,15 +19,16 @@
 -include("dubbo.hrl").
 
 gen_provice_config_test() ->
-    ProviderConfigInfo = dubbo_config_util:gen_provider(<<"defaultApp">>, 20880, <<"org.apache.dubbo.test.interface">>, [method1],dubbo_service_user_impl, []),
+    ProviderConfigInfo = dubbo_config_util:gen_provider(<<"defaultApp">>, 20880, <<"org.apache.dubbo.test.interface">>, [method1], dubbo_service_user_impl, []),
     ProvideNode = dubbo_node_config_util:gen_provider_info(ProviderConfigInfo),
     ?assert(is_binary(ProvideNode)).
 
 
 provider_parse_test() ->
-    {ok, ProviderConfig} = dubbo_node_config_util:parse_provider_info(<<"dubbo%3A%2F%2F127.0.0.1%3A20880%2Forg.apache.dubbo.test.interface%3Finterface=org.apache.dubbo.test.interface&application=defaultApp&anyhost=true&dubbo=2.5.3&executes=10&methods=method1&side=provider&timestamp=1556095933071">>),
-    ?assertEqual(ProviderConfig#provider_config.protocol, dubbo),
-    ?assertEqual(ProviderConfig#provider_config.host, "127.0.0.1"),
+    {ok, ProviderUrlInfo} = dubbo_common_fun:parse_url(<<"dubbo://127.0.0.1:20880/org.apache.dubbo.test.interface?interface=org.apache.dubbo.test.interface&application=defaultApp&anyhost=true&dubbo=2.5.3&executes=10&methods=method1&side=provider&timestamp=1556095933071">>),
+    {ok, ProviderConfig} = dubbo_node_config_util:parse_provider_info(ProviderUrlInfo),
+    ?assertEqual(ProviderConfig#provider_config.protocol, <<"dubbo">>),
+    ?assertEqual(ProviderConfig#provider_config.host, <<"127.0.0.1">>),
     ?assertEqual(ProviderConfig#provider_config.port, 20880),
     ?assertEqual(ProviderConfig#provider_config.interface, <<"org.apache.dubbo.test.interface">>),
     ?assert(true).
diff --git a/test/reference_config_SUITE.erl b/test/reference_config_SUITE.erl
index 4005311..e9ae8a4 100644
--- a/test/reference_config_SUITE.erl
+++ b/test/reference_config_SUITE.erl
@@ -48,6 +48,7 @@ init_per_suite(Config) ->
 %% Config0 = Config1 = [tuple()]
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
+    application:stop(dubboerl),
     ok.
 
 %%--------------------------------------------------------------------