Skip to content

Commit d3c922d

Browse files
adifucanadifucan
committed
MCP-826: Use RabbitMQ for all consumers if AMQP is set in deployment config
- Fix failed integration tests;
1 parent 54341b3 commit d3c922d

File tree

6 files changed

+59
-33
lines changed

6 files changed

+59
-33
lines changed

‎dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_consumer.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
99
<consumer name="queue.for.multiple.topics.test.c" queue="queue.for.multiple.topics.test.c"/>
1010
<consumer name="queue.for.multiple.topics.test.d" queue="queue.for.multiple.topics.test.d"/>
11-
<consumer name="queue.for.multiple.topics.test.y" queue="queue.for.multiple.topics.test.y"/>
12-
<consumer name="queue.for.multiple.topics.test.z" queue="queue.for.multiple.topics.test.z"/>
13-
<consumer name="mixed.sync.and.async.queue.consumer" queue="mixed.sync.and.async.queue"/>
14-
<consumer name="mtmh.queue.1.consumer" queue="mtmh.queue.1" handler="Magento\TestModuleAsyncAmqp\Model\CustomHandler::processMixed"/>
15-
<consumer name="mtmh.queue.2.consumer" queue="mtmh.queue.2"/>
16-
17-
<consumer name="wildcard.queue.one.consumer" queue="wildcard.queue.one" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodOne"/>
18-
<consumer name="wildcard.queue.two.consumer" queue="wildcard.queue.two" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodTwo"/>
19-
<consumer name="wildcard.queue.three.consumer" queue="wildcard.queue.three" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodThree"/>
20-
<consumer name="wildcard.queue.four.consumer" queue="wildcard.queue.four" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodFour"/>
11+
<consumer name="queue.for.multiple.topics.test.y" queue="queue.for.multiple.topics.test.y" connection="amqp"/>
12+
<consumer name="queue.for.multiple.topics.test.z" queue="queue.for.multiple.topics.test.z" connection="amqp"/>
13+
<consumer name="mixed.sync.and.async.queue.consumer" connection="amqp" queue="mixed.sync.and.async.queue"/>
14+
<consumer name="mtmh.queue.1.consumer" queue="mtmh.queue.1" connection="amqp" handler="Magento\TestModuleAsyncAmqp\Model\CustomHandler::processMixed"/>
15+
<consumer name="mtmh.queue.2.consumer" queue="mtmh.queue.2" connection="amqp"/>
16+
<consumer name="wildcard.queue.one.consumer" connection="amqp" queue="wildcard.queue.one" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodOne"/>
17+
<consumer name="wildcard.queue.two.consumer" connection="amqp" queue="wildcard.queue.two" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodTwo"/>
18+
<consumer name="wildcard.queue.three.consumer" connection="amqp" queue="wildcard.queue.three" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodThree"/>
19+
<consumer name="wildcard.queue.four.consumer" connection="amqp" queue="wildcard.queue.four" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodFour"/>
2120
</config>

‎dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_publisher.xml

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,31 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
9-
<publisher topic="multi.topic.queue.topic.c"/>
10-
<publisher topic="multi.topic.queue.topic.d"/>
11-
<publisher topic="multi.topic.queue.topic.y"/>
12-
<publisher topic="multi.topic.queue.topic.z"/>
13-
<publisher topic="mtmh.topic.1"/>
14-
<publisher topic="mtmh.topic.2"/>
15-
16-
<publisher topic="segment1.segment2.segment3.wildcard"/>
17-
<publisher topic="segment2.segment3.wildcard"/>
18-
<publisher topic="not.matching.wildcard.topic"/>
9+
<publisher topic="multi.topic.queue.topic.c">
10+
<connection name="amqp" exchange="magento" />
11+
</publisher>
12+
<publisher topic="multi.topic.queue.topic.d">
13+
<connection name="amqp" exchange="magento" />
14+
</publisher>
15+
<publisher topic="multi.topic.queue.topic.y">
16+
<connection name="amqp" exchange="magento" />
17+
</publisher>
18+
<publisher topic="multi.topic.queue.topic.z">
19+
<connection name="amqp" exchange="magento" />
20+
</publisher>
21+
<publisher topic="mtmh.topic.1">
22+
<connection name="amqp" exchange="magento" />
23+
</publisher>
24+
<publisher topic="mtmh.topic.2">
25+
<connection name="amqp" exchange="magento" />
26+
</publisher>
27+
<publisher topic="segment1.segment2.segment3.wildcard">
28+
<connection name="amqp" exchange="magento" />
29+
</publisher>
30+
<publisher topic="segment2.segment3.wildcard">
31+
<connection name="amqp" exchange="magento" />
32+
</publisher>
33+
<publisher topic="not.matching.wildcard.topic">
34+
<connection name="amqp" exchange="magento" />
35+
</publisher>
1936
</config>

‎dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<binding id="wildcard2" destination="topic-queue2" destinationType="queue" topic="*.*.*" />
4040
</exchange>
4141

42-
<exchange name="overlappingDeprecatedExchange" type="topic" connection="db">
42+
<exchange name="overlappingDeprecatedExchange" type="topic">
4343
<binding id="binding1" topic="overlapping.topic.declaration" destinationType="queue" destination="topology.config.queue" />
4444
<binding id="binding2" topic="deprecated.config.async.string.topic" destinationType="queue" destination="topology.config.queue" />
4545
</exchange>

‎dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_consumer.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
9-
<consumer name="synchronousRpcTestConsumer" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
10-
<consumer name="RemoteServiceTestConsumer" queue="queue.magento.testModuleSynchronousAmqp.api.serviceInterface.execute" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
11-
<consumer name="mixed.sync.and.async.queue.consumer" queue="mixed.sync.and.async.queue" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
12-
<consumer name="queue.for.multiple.topics.test.a" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
13-
<consumer name="queue.for.multiple.topics.test.b" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
9+
<consumer name="synchronousRpcTestConsumer" queue="synchronous.rpc.test" connection="amqp" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
10+
<consumer name="RemoteServiceTestConsumer" queue="queue.magento.testModuleSynchronousAmqp.api.serviceInterface.execute" connection="amqp" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
11+
<consumer name="mixed.sync.and.async.queue.consumer" queue="mixed.sync.and.async.queue" connection="amqp" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
12+
<consumer name="queue.for.multiple.topics.test.a" queue="synchronous.rpc.test" connection="amqp" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
13+
<consumer name="queue.for.multiple.topics.test.b" queue="synchronous.rpc.test" connection="amqp" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
1414
</config>

‎dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_publisher.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,19 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
9-
<publisher topic="synchronous.rpc.test"/>
10-
<publisher topic="magento.testModuleSynchronousAmqp.api.serviceInterface.execute"/>
11-
<publisher topic="sync.topic.for.mixed.sync.and.async.queue"/>
12-
<publisher topic="multi.topic.queue.topic.a"/>
13-
<publisher topic="multi.topic.queue.topic.b"/>
9+
<publisher topic="synchronous.rpc.test">
10+
<connection name="amqp" exchange="magento" />
11+
</publisher>
12+
<publisher topic="magento.testModuleSynchronousAmqp.api.serviceInterface.execute">
13+
<connection name="amqp" exchange="magento" />
14+
</publisher>
15+
<publisher topic="sync.topic.for.mixed.sync.and.async.queue">
16+
<connection name="amqp" exchange="magento" />
17+
</publisher>
18+
<publisher topic="multi.topic.queue.topic.a">
19+
<connection name="amqp" exchange="magento" />
20+
</publisher>
21+
<publisher topic="multi.topic.queue.topic.b">
22+
<connection name="amqp" exchange="magento" />
23+
</publisher>
1424
</config>

‎dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ public function testGetTopologyOverlapWithQueueConfig()
6262
{
6363
/** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
6464
$config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
65-
$topology = $config->getExchange('overlappingDeprecatedExchange', 'amqp');
65+
$topology = $config->getExchange('overlappingDeprecatedExchange', 'db');
6666
$this->assertEquals('overlappingDeprecatedExchange', $topology->getName());
6767
$this->assertEquals('topic', $topology->getType());
68-
$this->assertEquals('amqp', $topology->getConnection());
68+
$this->assertEquals('db', $topology->getConnection());
6969
$this->assertTrue($topology->isDurable());
7070
$this->assertFalse($topology->isAutoDelete());
7171
$this->assertFalse($topology->isInternal());

0 commit comments

Comments
 (0)