root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13855 from rabbitmq/mergify/bp/v4.1.x/pr-13850
Test (make) / Build and Xref (1.17, 26) (push) Waiting to run Details
Test (make) / Build and Xref (1.17, 27) (push) Waiting to run Details
Test (make) / Test (1.17, 27, khepri) (push) Waiting to run Details
Test (make) / Test (1.17, 27, mnesia) (push) Waiting to run Details
Test (make) / Test mixed clusters (1.17, 27, khepri) (push) Waiting to run Details
Test (make) / Test mixed clusters (1.17, 27, mnesia) (push) Waiting to run Details
Test (make) / Type check (1.17, 27) (push) Waiting to run Details
Trigger a 4.1.x alpha release build / trigger_alpha_build (push) Has been cancelled Details
Test Management UI with Selenium / selenium (chrome, 1.17.3, 27.3) (push) Has been cancelled Details 

STOMP: queue type tests - add queue.type assertions (backport #13850)
This commit is contained in:
Michael Klishin 2025-05-05 23:36:26 +04:00 committed by GitHub
parent e569855eee 24e873db0c
commit 1b7d66808a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbitmq_stomp/Makefile vendored
View File

@ -31,7 +31,7 @@ define PROJECT_APP_EXTRA_KEYS
endef endef
DEPS = ranch rabbit_common rabbit amqp_client DEPS = ranch rabbit_common rabbit amqp_client
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management
PLT_APPS += rabbitmq_cli elixir PLT_APPS += rabbitmq_cli elixir

4
deps/rabbitmq_stomp/test/python_SUITE.erl vendored
View File

@ -31,13 +31,11 @@ groups() ->
]. ].
init_per_suite(Config) -> init_per_suite(Config) ->
DataDir = ?config(data_dir, Config),
{ok, _} = rabbit_ct_helpers:exec(["pip", "install", "-r", requirements_path(Config), {ok, _} = rabbit_ct_helpers:exec(["pip", "install", "-r", requirements_path(Config),
"--target", deps_path(Config)]), "--target", deps_path(Config)]),
Config. Config.
end_per_suite(Config) -> end_per_suite(Config) ->
DataDir = ?config(data_dir, Config),
ok = file:del_dir_r(deps_path(Config)), ok = file:del_dir_r(deps_path(Config)),
Config. Config.
@ -82,8 +80,10 @@ run(Config, Test) ->
StompPort = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_stomp), StompPort = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_stomp),
StompPortTls = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_stomp_tls), StompPortTls = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_stomp_tls),
AmqpPort = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp), AmqpPort = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp),
MgmtPort = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_mgmt),
NodeName = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), NodeName = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
os:putenv("AMQP_PORT", integer_to_list(AmqpPort)), os:putenv("AMQP_PORT", integer_to_list(AmqpPort)),
os:putenv("MGMT_PORT", integer_to_list(MgmtPort)),
os:putenv("STOMP_PORT", integer_to_list(StompPort)), os:putenv("STOMP_PORT", integer_to_list(StompPort)),
os:putenv("STOMP_PORT_TLS", integer_to_list(StompPortTls)), os:putenv("STOMP_PORT_TLS", integer_to_list(StompPortTls)),
os:putenv("RABBITMQ_NODENAME", atom_to_list(NodeName)), os:putenv("RABBITMQ_NODENAME", atom_to_list(NodeName)),

2
deps/rabbitmq_stomp/test/python_SUITE_data/src/requirements.txt vendored
View File

@ -1,3 +1,3 @@
stomp.py==8.1.0 stomp.py==8.1.0
pika==1.1.0 pika==1.1.0
rabbitman===0.1.0

7
deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_quorum.py vendored
View File

@ -10,7 +10,7 @@ import base
import time import time
import os import os
import re import re
import rabbitman
class TestUserGeneratedQueueName(base.BaseTest): class TestUserGeneratedQueueName(base.BaseTest):
@ -34,6 +34,11 @@ class TestUserGeneratedQueueName(base.BaseTest):
# let the quorum queue some time to start # let the quorum queue some time to start
time.sleep(5) time.sleep(5)
client = rabbitman.Client(f'http://localhost:{(os.environ["MGMT_PORT"])}', 'guest', 'guest')
queue = client.get_queues_by_vhost_and_name("/", queueName)
self.assertEqual(queue['type'], 'quorum')
connection = pika.BlockingConnection( connection = pika.BlockingConnection(
pika.ConnectionParameters(host='127.0.0.1', port=int(os.environ["AMQP_PORT"]))) pika.ConnectionParameters(host='127.0.0.1', port=int(os.environ["AMQP_PORT"])))
channel = connection.channel() channel = connection.channel()

9
deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_stream.py vendored
View File

@ -10,7 +10,7 @@ import base
import time import time
import os import os
import re import re
import urllib.request, json import rabbitman
class TestUserGeneratedQueueName(base.BaseTest): class TestUserGeneratedQueueName(base.BaseTest):
@ -34,12 +34,17 @@ class TestUserGeneratedQueueName(base.BaseTest):
'id': 1234, 'id': 1234,
'prefetch-count': 10 'prefetch-count': 10
}, },
ack="client" ack="client"
) )
# let the stream queue some time to start # let the stream queue some time to start
time.sleep(5) time.sleep(5)
client = rabbitman.Client(f'http://localhost:{(os.environ["MGMT_PORT"])}', 'guest', 'guest')
queue = client.get_queues_by_vhost_and_name("/", queueName)
self.assertEqual(queue['type'], 'stream')
connection = pika.BlockingConnection( connection = pika.BlockingConnection(
pika.ConnectionParameters(host='127.0.0.1', port=int(os.environ["AMQP_PORT"]))) pika.ConnectionParameters(host='127.0.0.1', port=int(os.environ["AMQP_PORT"])))
channel = connection.channel() channel = connection.channel()