diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2019-01-01 14:14:24 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2019-01-01 14:14:24 +0300 |
| commit | 0c0ff722884966de654a5768d610aae87899e561 (patch) | |
| tree | 1361866635409c42af0761b5b701d072378cfa88 /test | |
| parent | 7858e4499d679c7399e7593c34b06d55982abec4 (diff) | |
| parent | 3e35edaee37f8faa2def517d4046944f95621480 (diff) | |
| download | rabbitmq-server-git-0c0ff722884966de654a5768d610aae87899e561.tar.gz | |
Merge branch 'master' into max_msg_size
Diffstat (limited to 'test')
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 12 | ||||
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 4 | ||||
| -rw-r--r-- | test/rabbit_fifo_prop_SUITE.erl | 22 |
3 files changed, 25 insertions, 13 deletions
diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index b318adaa12..50ca777aa8 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -326,15 +326,15 @@ tcp_listen_options.exit_on_close = false", {ssl_options, [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"}, {ciphers, [ - "DHE-RSA-AES256-GCM-SHA384", + "ECDHE-ECDSA-AES256-GCM-SHA384", + "ECDHE-RSA-AES256-GCM-SHA384", + "ECDHE-ECDSA-AES256-SHA384", + "ECDHE-RSA-AES256-SHA384", "ECDH-ECDSA-AES256-GCM-SHA384", - "ECDH-ECDSA-AES256-SHA384", "ECDH-RSA-AES256-GCM-SHA384", + "ECDH-ECDSA-AES256-SHA384", "ECDH-RSA-AES256-SHA384", - "ECDHE-ECDSA-AES256-GCM-SHA384", - "ECDHE-ECDSA-AES256-SHA384", - "ECDHE-RSA-AES256-GCM-SHA384", - "ECDHE-RSA-AES256-SHA384" + "DHE-RSA-AES256-GCM-SHA384" ]}, {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index 6f06f3b874..ee73d1ed7b 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -1539,8 +1539,8 @@ purge(Config) -> _DeliveryTag = consume(Ch, QQ, false), wait_for_messages_ready(Servers, RaName, 1), wait_for_messages_pending_ack(Servers, RaName, 1), - {'queue.purge_ok', 2} = amqp_channel:call(Ch, #'queue.purge'{queue = QQ}), - wait_for_messages_pending_ack(Servers, RaName, 0), + {'queue.purge_ok', 1} = amqp_channel:call(Ch, #'queue.purge'{queue = QQ}), + wait_for_messages_pending_ack(Servers, RaName, 1), wait_for_messages_ready(Servers, RaName, 0). sync_queue(Config) -> diff --git a/test/rabbit_fifo_prop_SUITE.erl b/test/rabbit_fifo_prop_SUITE.erl index 1c1ab42a9e..1af0d3b4b0 100644 --- a/test/rabbit_fifo_prop_SUITE.erl +++ b/test/rabbit_fifo_prop_SUITE.erl @@ -278,8 +278,16 @@ handle_op(purge, T) -> do_apply(Cmd, #t{effects = Effs, index = Index, state = S0, log = Log} = T) -> - {S, Effects, _} = rabbit_fifo:apply(#{index => Index}, Cmd, [], S0), - T#t{state = S, + {St, Effects} = case rabbit_fifo:apply(#{index => Index}, Cmd, S0) of + {S, _, E} when is_list(E) -> + {S, E}; + {S, _, E} -> + {S, [E]}; + {S, _} -> + {S, []} + end, + + T#t{state = St, index = Index + 1, effects = enq_effs(Effects, Effs), log = [Cmd | Log]}. @@ -338,9 +346,13 @@ prefixes(Source, N, Acc) -> run_log(InitState, Entries) -> lists:foldl(fun ({Idx, E}, {Acc0, Efx0}) -> - case rabbit_fifo:apply(meta(Idx), E, Efx0, Acc0) of - {Acc, Efx, _} -> - {Acc, Efx} + case rabbit_fifo:apply(meta(Idx), E, Acc0) of + {Acc, _, Efx} when is_list(Efx) -> + {Acc, Efx0 ++ Efx}; + {Acc, _, Efx} -> + {Acc, Efx0 ++ [Efx]}; + {Acc, _} -> + {Acc, Efx0} end end, {InitState, []}, Entries). |