Skip to content

Commit

Permalink
Merge 7163573 into dc8cf2b
Browse files Browse the repository at this point in the history
  • Loading branch information
@fenek
fenek authored May 6, 2019
2 parents dc8cf2b + 7163573 commit 8cc75ab
Show file tree
Hide file tree
Showing 27 changed files with 1,018 additions and 124 deletions.
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ branches:
- stable
- /^rel\-\d+\.\d+$/
- /^\d+\.\d+\.\d+([a-z0-9\-\+])*/
- gdpr-retrieve-clean

otp_release:
- 19.3
Expand Down
131 changes: 66 additions & 65 deletions big_tests/default.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,71 +11,72 @@
%% do not remove below SUITE if testing mongoose
{suites, "tests", mongoose_sanity_checks_SUITE}.

{suites, "tests", rdbms_SUITE}.
{suites, "tests", race_conditions_SUITE}.
{suites, "tests", acc_e2e_SUITE}.
{suites, "tests", accounts_SUITE}.
{suites, "tests", adhoc_SUITE}.
{suites, "tests", amp_big_SUITE}.
{suites, "tests", anonymous_SUITE}.
{suites, "tests", bosh_SUITE}.
{suites, "tests", carboncopy_SUITE}.
{suites, "tests", cluster_commands_SUITE}.
{suites, "tests", conf_reload_SUITE}.
{suites, "tests", connect_SUITE}.
{suites, "tests", component_SUITE}.
{suites, "tests", disco_and_caps_SUITE}.
{suites, "tests", ejabberdctl_SUITE}.
{suites, "tests", inbox_SUITE}.
{suites, "tests", jingle_SUITE}.
{suites, "tests", last_SUITE}.
{suites, "tests", login_SUITE}.
{suites, "tests", mam_SUITE}.
{suites, "tests", metrics_api_SUITE}.
{suites, "tests", metrics_c2s_SUITE}.
{suites, "tests", metrics_roster_SUITE}.
{suites, "tests", metrics_register_SUITE}.
{suites, "tests", metrics_session_SUITE}.
{suites, "tests", mod_aws_sns_SUITE}.
{suites, "tests", mod_blocking_SUITE}.
{suites, "tests", mod_event_pusher_rabbit_SUITE}.
{suites, "tests", mod_http_notification_SUITE}.
{suites, "tests", mod_http_upload_SUITE}.
{suites, "tests", mod_ping_SUITE}.
{suites, "tests", mod_time_SUITE}.
{suites, "tests", mod_version_SUITE}.
{suites, "tests", muc_SUITE}.
{suites, "tests", muc_light_SUITE}.
{suites, "tests", muc_light_legacy_SUITE}.
{suites, "tests", muc_http_api_SUITE}.
{suites, "tests", muc_light_http_api_SUITE}.
{suites, "tests", oauth_SUITE}.
{suites, "tests", offline_SUITE}.
{suites, "tests", pep_SUITE}.
{suites, "tests", presence_SUITE}.
{suites, "tests", privacy_SUITE}.
{suites, "tests", private_SUITE}.
{suites, "tests", pubsub_SUITE}.
{suites, "tests", push_SUITE}.
{suites, "tests", push_http_SUITE}.
{suites, "tests", push_integration_SUITE}.
{suites, "tests", push_pubsub_SUITE}.
{suites, "tests", rest_SUITE}.
{suites, "tests", rest_client_SUITE}.
{suites, "tests", s2s_SUITE}.
{suites, "tests", sasl_SUITE}.
{suites, "tests", shared_roster_SUITE}.
{suites, "tests", sic_SUITE}.
{suites, "tests", sm_SUITE}.
{suites, "tests", users_api_SUITE}.
{suites, "tests", vcard_simple_SUITE}.
{suites, "tests", vcard_SUITE}.
{suites, "tests", websockets_SUITE}.
{suites, "tests", xep_0352_csi_SUITE}.
{suites, "tests", mod_global_distrib_SUITE}.
{suites, "tests", mongoose_cassandra_SUITE}.
{suites, "tests", mongoose_elasticsearch_SUITE}.
{suites, "tests", sasl_external_SUITE}.
%{suites, "tests", rdbms_SUITE}.
%{suites, "tests", race_conditions_SUITE}.
%{suites, "tests", acc_e2e_SUITE}.
%{suites, "tests", accounts_SUITE}.
%{suites, "tests", adhoc_SUITE}.
%{suites, "tests", amp_big_SUITE}.
%{suites, "tests", anonymous_SUITE}.
%{suites, "tests", bosh_SUITE}.
%{suites, "tests", carboncopy_SUITE}.
%{suites, "tests", cluster_commands_SUITE}.
%{suites, "tests", conf_reload_SUITE}.
%{suites, "tests", connect_SUITE}.
%{suites, "tests", component_SUITE}.
%{suites, "tests", disco_and_caps_SUITE}.
%{suites, "tests", ejabberdctl_SUITE}.
{suites, "tests", gdpr_SUITE}.
%{suites, "tests", inbox_SUITE}.
%{suites, "tests", jingle_SUITE}.
%{suites, "tests", last_SUITE}.
%{suites, "tests", login_SUITE}.
%{suites, "tests", mam_SUITE}.
%{suites, "tests", metrics_api_SUITE}.
%{suites, "tests", metrics_c2s_SUITE}.
%{suites, "tests", metrics_roster_SUITE}.
%{suites, "tests", metrics_register_SUITE}.
%{suites, "tests", metrics_session_SUITE}.
%{suites, "tests", mod_aws_sns_SUITE}.
%{suites, "tests", mod_blocking_SUITE}.
%{suites, "tests", mod_event_pusher_rabbit_SUITE}.
%{suites, "tests", mod_http_notification_SUITE}.
%{suites, "tests", mod_http_upload_SUITE}.
%{suites, "tests", mod_ping_SUITE}.
%{suites, "tests", mod_time_SUITE}.
%{suites, "tests", mod_version_SUITE}.
%{suites, "tests", muc_SUITE}.
%{suites, "tests", muc_light_SUITE}.
%{suites, "tests", muc_light_legacy_SUITE}.
%{suites, "tests", muc_http_api_SUITE}.
%{suites, "tests", muc_light_http_api_SUITE}.
%{suites, "tests", oauth_SUITE}.
%{suites, "tests", offline_SUITE}.
%{suites, "tests", pep_SUITE}.
%{suites, "tests", presence_SUITE}.
%{suites, "tests", privacy_SUITE}.
%{suites, "tests", private_SUITE}.
%{suites, "tests", pubsub_SUITE}.
%{suites, "tests", push_SUITE}.
%{suites, "tests", push_http_SUITE}.
%{suites, "tests", push_integration_SUITE}.
%{suites, "tests", push_pubsub_SUITE}.
%{suites, "tests", rest_SUITE}.
%{suites, "tests", rest_client_SUITE}.
%{suites, "tests", s2s_SUITE}.
%{suites, "tests", sasl_SUITE}.
%{suites, "tests", shared_roster_SUITE}.
%{suites, "tests", sic_SUITE}.
%{suites, "tests", sm_SUITE}.
%{suites, "tests", users_api_SUITE}.
%{suites, "tests", vcard_simple_SUITE}.
%{suites, "tests", vcard_SUITE}.
%{suites, "tests", websockets_SUITE}.
%{suites, "tests", xep_0352_csi_SUITE}.
%{suites, "tests", mod_global_distrib_SUITE}.
%{suites, "tests", mongoose_cassandra_SUITE}.
%{suites, "tests", mongoose_elasticsearch_SUITE}.
%{suites, "tests", sasl_external_SUITE}.

{config, ["test.config"]}.
{logdir, "ct_report"}.
Expand Down
1 change: 1 addition & 0 deletions big_tests/rebar.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{escalus, {git, "https://github.com/esl/escalus.git", {ref, "8911491"}}},
{gen_fsm_compat, "0.3.0"},
{cowboy, "2.4.0"},
{csv, "3.0.3", {pkg, csve}},
{shotgun, {git, "https://github.com/inaka/shotgun.git", {ref, "636d14e"}}},
{amqp_client, "3.7.11-rc.1"},
%% Esip needs to find stun.hrl to compile
Expand Down
2 changes: 2 additions & 0 deletions big_tests/rebar.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{<<"chatterbox">>,{pkg,<<"chatterbox">>,<<"0.8.0">>},0},
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.4.0">>},0},
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.3.0">>},1},
{<<"csv">>,{pkg,<<"csve">>,<<"3.0.3">>},0},
{<<"erlsh">>,
{git,"https://github.com/proger/erlsh.git",
{ref,"4e8a107e4a082b5e687877cf08d152a45a715bf4"}},
Expand Down Expand Up @@ -98,6 +99,7 @@
{<<"chatterbox">>, <<"AF8B95EF45D5B9783B67ECEA1E23A4CCE058FCE5E950B42F84F4DF8BC7620D0B">>},
{<<"cowboy">>, <<"F1B72FABE9C8A5FC64AC5AC85FB65474D64733D1DF52A26FAD5D4BA3D9F70A9F">>},
{<<"cowlib">>, <<"BBD58EF537904E4F7C1DD62E6AA8BC831C8183CE4EFA9BD1150164FE15BE4CAA">>},
{<<"csv">>, <<"69E7D9B3FDC72016644368762C6A3E6CBFEB85BCCADBF1BD99AB6C827E360E04">>},
{<<"gen_fsm_compat">>, <<"5903549F67D595F58A7101154CBE0FDD46955FBFBE40813F1E53C23A970FF5F4">>},
{<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
{<<"gun">>, <<"18E5D269649C987AF95AEC309F68A27FFC3930531DD227A6EAA0884D6684286E">>},
Expand Down
2 changes: 2 additions & 0 deletions big_tests/tests/ejabberdctl_helper.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
-import(distributed_helper, [mim/0,
rpc/4]).

-spec ejabberdctl(Cmd :: string(), Args :: [binary() | string()], Config :: list()) ->
{Data :: iolist(), ExitStatus :: integer()} | no_return().
ejabberdctl(Cmd, Args, Config) ->
Node = mim(),
ejabberdctl(Node, Cmd, Args, Config).
Expand Down
Loading

0 comments on commit 8cc75ab

Please sign in to comment.