Commit Graph

220 Commits

Author SHA1 Message Date
turtleDeng 8653732bae Revert "Calculate the 1.5 keep alive time exactly" 2018-09-22 14:52:31 +08:00
周子博 b1d4ec750a Remove the same test cases as emqx_keepalive 2018-09-20 17:58:54 +08:00
HuangDan 3822ff987b Fix function args
Add test cases for emqx_pool module
2018-09-18 09:15:46 +08:00
spring2maz 35d209f364 Fix travis build 2018-09-14 00:52:03 +08:00
spring2maz 0c39a7620e Rebar3 and erlang.mk dual support. (#1806)
* Rebar3 and erlang.mk dual support.

There was only erlang.mk support prior to this change.
The main reasons for this dual support are:
* Cover report upload can only be done by rebar3 in travis.ci
* We want to prepare for the future to build emqx releases using rebar3
* We do not want to stop supporting erlang.mk in one single step

* Add depencency version consistency check between erlang.mk and rebar.config
2018-09-09 21:51:42 +08:00
周子博 08bab7efa4 Fix bugs in test cases 2018-09-08 11:49:20 +08:00
spring2maz 3a94d7ddae Generate a config file for testing
Prior to this change, the template file etc/emqx.conf is used
directly in testing, as a result, mustache style directories
are created e.g. `{{ platform_log_dir }}` which should have been
replaced with a config varialbe e.g. `log`

In this change, Makefile targets are added as `ct` dependency
to download bbmustach, load the template input, replace with
variableds defined in 'vars' file, finally to etc/gen.emqx.conf.
The direct usage of etc/emqx.conf in test code are replaced with
gen.emqx.conf
2018-09-07 07:04:04 +02:00
Feng Lee 5774ba542c Rename the emqx_mqtt_properties SUITE to emqx_mqtt_props 2018-09-06 18:10:01 +08:00
Feng Lee a4efcb5b2c Update Makefile and README.md 2018-08-31 01:08:01 +08:00
Gilbert Wong 487fa6824d add emqx_protocol test suites 2018-08-31 00:42:55 +08:00
Gilbert Wong a7274b115d ignore dup cases 2018-08-31 00:15:45 +08:00
Feng Lee 674b55e6e7
Merge pull request #1773 from tigercl/emqx30
Add emqx_banned test suite, and fix bugs in emqx_banned
2018-08-30 23:35:15 +08:00
周子博 83e11b6e39 Add emqx_banned test suite, and fix bugs in emqx_banned 2018-08-30 22:45:08 +08:00
Gilbert Wong d0eaa51928 add emqx listeners suite 2018-08-30 22:16:31 +08:00
周子博 e6d0329663 Fix test suites bug, and add emqx_message ct to Makefile 2018-08-30 19:55:44 +08:00
周子博 69b285aa3f Add test case for emqx_connection:attrs/1 2018-08-30 16:26:04 +08:00
周子博 c89f53f14d Add session, mountpoint test suites 2018-08-30 14:43:14 +08:00
Feng Lee 649f59d4dc Comment 'TEST_DEPS = emqx_ct_helplers' 2018-08-30 00:22:47 +08:00
Gilbert Wong 84f241522f update frame suite and frame suite 2018-08-29 14:36:40 +08:00
terry-xiaoyu c0fb5f3186 update gen_rpc 2018-08-27 19:28:54 +08:00
turtled 91eb79967c Add syslog 2018-08-27 13:50:38 +08:00
HuangDan e3fb147594 Fixed test case compilation error 2018-08-26 22:25:54 +08:00
Feng Lee 09b5535260 Depends on cowboy 2.4.0 2018-08-09 15:17:42 +08:00
turtled 4d9e03a803 Refactor websocket conn using cowboy 2018-08-08 18:36:14 +08:00
Feng Lee 1735786ffb Remove pbkdf2 lager_syslog bcrypt deps 2018-07-18 23:30:16 +08:00
Feng Lee b110a154ef Upgrade header files for EMQ X 3.0 2018-07-18 14:27:11 +08:00
Feng Lee 1de94b6858 Register the default ACL module in emqx_access_control 2018-06-21 22:40:30 +08:00
Feng Lee 22350f9117 Depends on canel-lock library 2018-03-09 13:26:46 +08:00
Feng Lee b144363f1e Depends on jsx 2.9.0 and gproc 0.7.0 2018-03-03 09:07:45 +08:00
Feng Lee fcb2ec8427 Merge the latest enterprise branch 2018-02-24 15:56:32 +08:00
Feng Lee b63c34ab14 Merge the latest master branch 2018-02-24 11:27:09 +08:00
Feng Lee 06b8db1967
Merge branch 'emq24' into develop 2018-02-01 12:20:43 +08:00
Feng Lee 0dac7a2708 Version 2.3.5 - depends on the 'develop' branch of esockd, ekka and mochiweb 2018-02-01 12:18:49 +08:00
Feng Lee 4727acad14 Depends on esockd v5.2.1, mochiweb v4.2.2 2018-02-01 12:13:46 +08:00
Feng Lee b9dcccd7f7 Version 2.3.4 2018-01-23 15:20:35 +08:00
Feng Lee fde905d754
Merge branch 'emq24' into develop 2018-01-07 12:53:30 +08:00
Feng Lee 953a7628a3 Version 2.3.3 2017-12-28 11:34:29 +08:00
Feng Lee 6d2483d6c0 Merge develop branch to emq24 2017-12-26 22:17:38 +08:00
Feng Lee 013cc9705e Depends on ekka v0.2.1 2017-12-26 22:15:09 +08:00
Feng Lee bcec25092b Merge version 2.3.2 to X edition 2017-12-26 21:09:24 +08:00
HuangDan 5aef79b1ad Fixed Conflicting files 2017-12-26 00:44:45 +08:00
HuangDan d7e56fa971 Upgrade the esockd library to v5.2 2017-12-25 17:31:23 +08:00
Feng Lee 6e5134a8b2 Merge with the enterprise edition 2017-12-07 16:24:48 +08:00
Feng Lee f1640f5b85 Merge emq24 to X branch 2017-12-07 11:02:44 +08:00
HuangDan ceafaad6b7 Update deps branch 2017-12-06 21:22:36 +08:00
HuangDan 921dba4eb4 Merge branch 'develop' into emq24 2017-12-06 21:20:30 +08:00
Feng Lee 0ba8d3e11d Depends on develop branch of esockd and mochiweb 2017-12-06 20:13:27 +08:00
huangdan b5c063f3cb
Merge pull request #1379 from emqtt/develop
Version 2.3.2
2017-12-06 15:52:55 +08:00
HuangDan 4c52d99706 Fixed test cases for emqttd_router_SUITE 2017-12-06 15:47:46 +08:00
Feng Lee c3c5589452 Version 2.3.2 2017-12-06 10:01:42 +08:00
huangdan e3161619c6
Merge pull request #1367 from emqtt/develop
Version 2.3.1
2017-12-03 00:54:07 +08:00
HuangDan b8e0a4d5c4 Bump version to 2.3.1 2017-12-03 00:43:42 +08:00
Feng Lee 223f3d4da5 Remove RPC configurations 2017-11-22 16:44:00 +08:00
Feng Lee 38c33e9c8b Merge with emqx 2017-11-21 22:41:05 +08:00
Feng Lee 2cec86eba7 Merge with version 2.3.0 2017-11-21 14:14:12 +08:00
huangdan 6c5d2e7d69
Merge pull request #1325 from emqtt/develop
Version 2.3.0
2017-11-19 00:55:59 -06:00
HuangDan 2d92f95294 Update the test cases for emqttd 2017-11-19 12:06:55 +08:00
Feng Lee 62d4f9f031 Bump version to 2.3.0 2017-11-17 20:53:07 +08:00
Feng Lee 4b8cd18f5d Merge with EMQ X project 2017-10-09 19:43:06 +08:00
Feng Lee e1816a5682 Remove rebar.config to fix the building error of CI 2017-08-28 17:31:38 +08:00
Feng Lee b5f741391b Add 'make autopatch' to fix the building error of travis CI 2017-08-28 15:01:50 +08:00
Feng Lee 12fb31f2f6 Merge pull request #1208 from getong/add_erlang_20
add erlang 20
2017-08-23 10:03:06 +08:00
huangdan 0a1ad99c88 Merge pull request #1214 from emqtt/emq24
Version 2.3-beta.3
2017-08-21 16:49:17 +08:00
HuangDan 75c6348cf5 Added more test cases for hot configuration 2017-08-16 03:07:30 +08:00
HuangDan 0f54613c11 Fix Conflicting files 2017-08-12 22:33:24 +08:00
HuangDan 8cb07b6299 Update Depends of clique 2017-08-11 17:15:53 +08:00
turtled 701ee3e8dc Add CLI set/get env 2017-08-10 18:19:20 +08:00
Feng Lee ffebce5090 Depend on develop branch of ekka 2017-07-26 13:58:44 +08:00
Feng Lee 74145cf5df Depends on master branch of ekka library 2017-07-23 18:55:21 +08:00
Feng Lee 263a553c50 Depends on emq24 branch of ekka library 2017-07-23 18:53:43 +08:00
Feng Lee 0a7ca2cdb3 Depends on ekka 0.2 develop branch 2017-07-18 18:37:52 +08:00
turtleDeng 523dd9c8b0 Merge pull request #1145 from emqtt/master
Merge emq22
2017-07-10 13:07:32 +08:00
huangdan f0fc53b9fe Merge pull request #1142 from emqtt/emq22
Version 2.2.0
2017-07-08 14:54:39 +08:00
HuangDan f9cf00804f Add dialyze dependencies 2017-07-06 15:54:03 +08:00
Feng Lee 9b646d8cbc Integrage with 'ekka' library 2017-06-16 12:30:09 +08:00
Feng Lee 44565a3de1 Version 2.3 2017-06-15 16:43:07 +08:00
huangdan 0067090d6a Merge pull request #1101 from emqtt/emq22
Version 2.2-rc.1
2017-06-13 22:21:16 +08:00
huangdan 034f39e811 Add ‘Compiled with option debug_info’ 2017-06-05 10:38:48 +08:00
turtled 3074a4b0ab Rollback code 2017-05-19 09:27:48 +08:00
turtled 798c60f269 Rollback code 2017-05-19 09:26:52 +08:00
turtled d5ccb9f92f Cli command support --format=json output 2017-05-17 16:27:18 +08:00
turtled 2d6104fbd9 Ctl use clique 2017-05-11 16:02:38 +08:00
turtled 9e211b55a0 deps branch master 2017-05-04 22:31:41 +08:00
turtled ba0c08517f v2.2 2017-04-25 10:41:43 +08:00
Feng Lee 87d3bb1419 Merge branch 'emq22' into emq20 2017-04-25 08:59:05 +08:00
Feng Lee 3c9cde59c7 Merge pull request #1004 from emqtt/develop
Fix crash caused by duplicated PUBREC packet
2017-04-20 10:15:30 +08:00
huangdan 6a14c7c1b9 Version 2.1.2 2017-04-20 09:48:34 +08:00
huangdan 65c7896f7c Merge pull request #993 from emqtt/develop
Version 2.1.1
2017-04-13 10:03:20 +08:00
huangdan 6effb5fdbe Version 2.1.1 2017-04-13 10:02:32 +08:00
turtled 7d618e78ff support bcrypt 2017-04-11 16:02:21 +08:00
Feng Lee 3ee8d18ab2 Merge branch 'master' into emq20 2017-03-24 14:55:28 +08:00
Feng Lee 783079cb07 Merge emq20 branch 2017-03-24 13:35:43 +08:00
Feng Lee 50a5c304e2 Merge branch 'emq20' into develop 2017-03-24 13:26:42 +08:00
Feng Lee b54fba2a5d Depend on emqtt/pbkdf2 to resovle the building errors of Travis CI 2017-03-24 12:35:39 +08:00
Feng Lee 181ac36171 Remove the 'erlang-pbkdf2' dep to resolve CI building error 2017-03-24 11:26:42 +08:00
Feng Lee 18c8785bf9 Fix 'rebar command not found' 2017-03-24 10:46:08 +08:00
Feng Lee f0e6fc16c7 Version 2.2 2017-03-22 10:48:12 +08:00
Feng Lee b3cb875eb2 Depends on the 'emq22' branch of esockd, mochiweb 2017-03-22 10:13:17 +08:00
Feng Lee 3ebcb71e9f Upgrade esockd library to v4.2 2017-03-13 17:03:34 +08:00
Feng Lee ecbc1cf56b Format the 'dep_' lines 2017-03-13 16:51:46 +08:00