Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@duhon
duhon committed Mar 5, 2024
1 parent 1cfc85e commit 72a2b70
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 115 deletions.
3 changes: 3 additions & 0 deletions etc/php/tests/acceptance/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ MAGENTO_BACKEND_NAME=admin
MAGENTO_ADMIN_USERNAME=admin
SELENIUM_CLOSE_ALL_SESSIONS=true
BROWSER=chromium
WINDOW_WIDTH=1920
WINDOW_HEIGHT=1080
MODULE_ALLOWLIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProductCatalogSearch
WAIT_TIMEOUT=60
MAGENTO_CLI_WAIT_TIMEOUT=60
BROWSER_LOG_BLOCKLIST=other
ELASTICSEARCH_VERSION=7
MAGENTO_ADMIN_PASSWORD=123123q
Expand Down
60 changes: 8 additions & 52 deletions etc/php/tests/api-functional/phpunit_rest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,58 +66,14 @@
<!-- Test listeners -->
<listeners>
<listener class="Magento\TestFramework\Event\PhpUnit"/>
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
</listeners>
<extensions>
<extension class="Qameta\Allure\PHPUnit\AllureExtension">
<!-- Optional arguments block; omit it if you want to use default values -->
<arguments>
<string>var/allure-results</string> <!-- XML files output folder -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
<array> <!-- A list of custom annotations to ignore (optional) -->
<element key="codingStandardsIgnoreStart">
<string>codingStandardsIgnoreStart</string>
</element>
<element key="codingStandardsIgnoreEnd">
<string>codingStandardsIgnoreEnd</string>
</element>
<element key="expectedExceptionMessageRegExp">
<string>expectedExceptionMessageRegExp</string>
</element>
<element key="magentoAdminConfigFixture">
<string>magentoAdminConfigFixture</string>
</element>
<element key="magentoAppArea">
<string>magentoAppArea</string>
</element>
<element key="magentoAppIsolation">
<string>magentoAppIsolation</string>
</element>
<element key="magentoCache">
<string>magentoCache</string>
</element>
<element key="magentoComponentsDir">
<string>magentoComponentsDir</string>
</element>
<element key="magentoConfigFixture">
<string>magentoConfigFixture</string>
</element>
<element key="magentoDataFixture">
<string>magentoDataFixture</string>
</element>
<element key="magentoDataFixtureBeforeTransaction">
<string>magentoDataFixtureBeforeTransaction</string>
</element>
<element key="magentoDbIsolation">
<string>magentoDbIsolation</string>
</element>
<element key="magentoIndexerDimensionMode">
<string>magentoIndexerDimensionMode</string>
</element>
<element key="magentoApiDataFixture">
<string>magentoApiDataFixture</string>
</element>
<element key="Override">
<string>Override</string>
</element>
</array>
<!-- Path to config file (default is config/allure.config.php) -->
<string>allure/allure.config.php</string>
</arguments>
</listener>
</listeners>
</extension>
</extensions>
</phpunit>
62 changes: 10 additions & 52 deletions etc/php/tests/api-functional/phpunit_soap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<php>
<includePath>./testsuite</includePath>
<const name="TESTS_INSTALL_CONFIG_FILE" value="config/install-config-mysql.php"/>
<!-- Local XML post installation configuration file ('.dist' extension will be added, if the specified file doesn't exist) -->
<const name="TESTS_POST_INSTALL_SETUP_COMMAND_CONFIG_FILE" value="config/post-install-setup-command-config.php"/>
<const name="TESTS_GLOBAL_CONFIG_FILE" value="config/config-global.php"/>
<!-- WebSerivice Type -->
<const name="TESTS_WEB_API_ADAPTER" value="soap"/>
Expand Down Expand Up @@ -63,58 +65,14 @@
<!-- Test listeners -->
<listeners>
<listener class="Magento\TestFramework\Event\PhpUnit"/>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
</listeners>
<extensions>
<extension class="Qameta\Allure\PHPUnit\AllureExtension">
<!-- Optional arguments block; omit it if you want to use default values -->
<arguments>
<string>var/allure-results</string> <!-- XML files output folder -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
<array> <!-- A list of custom annotations to ignore (optional) -->
<element key="codingStandardsIgnoreStart">
<string>codingStandardsIgnoreStart</string>
</element>
<element key="codingStandardsIgnoreEnd">
<string>codingStandardsIgnoreEnd</string>
</element>
<element key="expectedExceptionMessageRegExp">
<string>expectedExceptionMessageRegExp</string>
</element>
<element key="magentoAdminConfigFixture">
<string>magentoAdminConfigFixture</string>
</element>
<element key="magentoAppArea">
<string>magentoAppArea</string>
</element>
<element key="magentoAppIsolation">
<string>magentoAppIsolation</string>
</element>
<element key="magentoCache">
<string>magentoCache</string>
</element>
<element key="magentoComponentsDir">
<string>magentoComponentsDir</string>
</element>
<element key="magentoConfigFixture">
<string>magentoConfigFixture</string>
</element>
<element key="magentoDataFixture">
<string>magentoDataFixture</string>
</element>
<element key="magentoDataFixtureBeforeTransaction">
<string>magentoDataFixtureBeforeTransaction</string>
</element>
<element key="magentoDbIsolation">
<string>magentoDbIsolation</string>
</element>
<element key="magentoIndexerDimensionMode">
<string>magentoIndexerDimensionMode</string>
</element>
<element key="magentoApiDataFixture">
<string>magentoApiDataFixture</string>
</element>
<element key="Override">
<string>Override</string>
</element>
</array>
<!-- Path to config file (default is config/allure.config.php) -->
<string>allure/allure.config.php</string>
</arguments>
</listener>
</listeners>
</extension>
</extensions>
</phpunit>
20 changes: 10 additions & 10 deletions etc/php/tests/integration/install-config-mysql.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
'db-password' => '',
'db-name' => 'magento_integration_tests',
'db-prefix' => '',
'search-engine' => 'elasticsearch7',
// 'search-engine' => 'elasticsearch7',
'elasticsearch-host' => 'elastic',
'elasticsearch-port' => '9200',
'elasticsearch-port' => '9200',
'backend-frontname' => 'backend',
// 'search-engine' => 'opensearch',
// 'opensearch-host' => 'opensearch',
// 'opensearch-port' => 9200,
'search-engine' => 'opensearch',
'opensearch-host' => 'opensearch',
'opensearch-port' => 9200,
'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
'amqp-host' => 'rabbit',
'amqp-port' => '5672',
'amqp-user' => 'guest',
'amqp-password' => 'guest',
'consumers-wait-for-messages' => '0',
// 'amqp-host' => 'rabbit',
// 'amqp-port' => '5672',
// 'amqp-user' => 'guest',
// 'amqp-password' => 'guest',
// 'consumers-wait-for-messages' => '0',
];
2 changes: 1 addition & 1 deletion etc/php/tools/reinstall
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ bin/magento setup:install -n \
--admin-password=123123q \
--db-name=magento \
--db-host=db \
--elasticsearch-host=elastic \
--opensearch-host=elastic \
--search-engine=opensearch \
--enable-modules=all \
--key=magento_super_puper_secret_key32 \
--allow-parallel-generation \
Expand Down
Binary file added etc/php/tools/server
View file
Binary file not shown.
Binary file added etc/php/tools/taillogs
View file
Binary file not shown.

0 comments on commit 72a2b70

Please sign in to comment.