yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-feng

This commit is contained in:
Feng Lee 2015-10-14 10:59:57 +08:00
parent 3dd42b65cf e81aa57cde
commit 1a0d536cd0
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,6 +7,8 @@ emqttd requires Erlang R17+ to build.
**DON'T compile the broker with Erlang/OTP R18.0 which introduced a [binary memory leak](http://erlang.org/pipermail/erlang-questions/2015-September/086098.html).** **DON'T compile the broker with Erlang/OTP R18.0 which introduced a [binary memory leak](http://erlang.org/pipermail/erlang-questions/2015-September/086098.html).**
Demo Server: tcp://t.emqtt.io:1883
Twitter: [@emqtt](https://twitter.com/emqtt) Twitter: [@emqtt](https://twitter.com/emqtt)
## Goals ## Goals

9
test/emqttd_topic_tests.erl
View File

@ -68,10 +68,10 @@ sigle_level_match_test() ->
?assertNot( match(<<"/finance">>, <<"+">>) ). ?assertNot( match(<<"/finance">>, <<"+">>) ).
sys_match_test() -> sys_match_test() ->
?assert( match(<<"$SYS/borker/clients/testclient">>, <<"$SYS/#">>) ), ?assert( match(<<"$SYS/broker/clients/testclient">>, <<"$SYS/#">>) ),
?assert( match(<<"$SYS/borker">>, <<"$SYS/+">>) ), ?assert( match(<<"$SYS/broker">>, <<"$SYS/+">>) ),
?assertNot( match(<<"$SYS/borker">>, <<"+/+">>) ), ?assertNot( match(<<"$SYS/broker">>, <<"+/+">>) ),
?assertNot( match(<<"$SYS/borker">>, <<"#">>) ). ?assertNot( match(<<"$SYS/broker">>, <<"#">>) ).
'#_match_test'() -> '#_match_test'() ->
?assert( match(<<"a/b/c">>, <<"#">>) ), ?assert( match(<<"a/b/c">>, <<"#">>) ),
@ -127,4 +127,3 @@ join_test() ->
?assertEqual(<<"ab/+/#">>, emqttd_topic:join(words(<<"ab/+/#">>))). ?assertEqual(<<"ab/+/#">>, emqttd_topic:join(words(<<"ab/+/#">>))).
-endif. -endif.