Skip to content

Commit 131d30a

Browse files
author
obaranovskyi
committed
Merge remote-tracking branch 'mainlinece/develop' into develop
2 parents 2858a2d + 1270ddb commit 131d30a

File tree

92 files changed

+2
-9421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2
-9421
lines changed

app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ private function setupTestInfo()
116116
{
117117
$this->commands = [
118118
'unit' => ['../tests/unit', ''],
119-
'unit-performance' => ['../tests/performance/framework/tests/unit', ''],
120119
'unit-static' => ['../tests/static/framework/tests/unit', ''],
121120
'unit-integration' => ['../tests/integration/framework/tests/unit', ''],
122121
'integration' => ['../tests/integration', ''],
@@ -127,7 +126,7 @@ private function setupTestInfo()
127126
];
128127
$this->types = [
129128
'all' => array_keys($this->commands),
130-
'unit' => ['unit', 'unit-performance', 'unit-static', 'unit-integration'],
129+
'unit' => ['unit', 'unit-static', 'unit-integration'],
131130
'integration' => ['integration'],
132131
'integration-all' => ['integration', 'integration-integrity'],
133132
'static' => ['static-default'],
@@ -136,7 +135,6 @@ private function setupTestInfo()
136135
'legacy' => ['static-legacy'],
137136
'default' => [
138137
'unit',
139-
'unit-performance',
140138
'unit-static',
141139
'unit-integration',
142140
'integration',

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock

Lines changed: 0 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock

Lines changed: 0 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock

Lines changed: 0 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/performance/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)