Skip to content

Commit 84b69d1

Browse files
authored
Merge pull request #7071 from magento-arcticfoxes/B2B-1790
B2B-1790: AMQP: Update Integration Test Framework To Work With Https …
2 parents f0f779a + 52f6270 commit 84b69d1

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class Amqp
1616
const CONFIG_PATH_HOST = 'queue/amqp/host';
1717
const CONFIG_PATH_USER = 'queue/amqp/user';
1818
const CONFIG_PATH_PASSWORD = 'queue/amqp/password';
19+
const DEFAULT_MANAGEMENT_PROTOCOL = 'http';
1920
const DEFAULT_MANAGEMENT_PORT = '15672';
2021

2122
/**
@@ -51,7 +52,10 @@ public function __construct(
5152
);
5253
$this->curl->addHeader('content-type', 'application/json');
5354
$this->host = sprintf(
54-
'http://%s:%s/api/',
55+
'%s://%s:%s/api/',
56+
defined('RABBITMQ_MANAGEMENT_PROTOCOL')
57+
? RABBITMQ_MANAGEMENT_PROTOCOL
58+
: self::DEFAULT_MANAGEMENT_PROTOCOL,
5559
$this->deploymentConfig->get(self::CONFIG_PATH_HOST),
5660
defined('RABBITMQ_MANAGEMENT_PORT') ? RABBITMQ_MANAGEMENT_PORT : self::DEFAULT_MANAGEMENT_PORT
5761
);

dev/tests/integration/phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<!--<const name="MONGODB_CONNECTION_STRING" value="mongodb://localhost:27017"/>-->
8181
<!--<const name="MONGODB_DATABASE_NAME" value="magento_integration_tests"/>-->
8282
<!-- Connection parameters for RabbitMQ tests -->
83+
<!--<const name="RABBITMQ_MANAGEMENT_PROTOCOL" value="https"/>-->
8384
<!--<const name="RABBITMQ_MANAGEMENT_PORT" value="15672"/>-->
8485
<!--<const name="TESTS_PARALLEL_RUN" value="1"/>-->
8586
<const name="USE_OVERRIDE_CONFIG" value="enabled"/>

0 commit comments

Comments
 (0)