Skip to content

Commit 3d63895

Browse files
author
Roman Ganin
committed
MAGETWO-33403: Fix integration test for performance toolkit
1 parent 8a9babf commit 3d63895

File tree

4 files changed

+17
-204
lines changed

4 files changed

+17
-204
lines changed

composer.lock

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

dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -130,33 +130,6 @@ public function reindex()
130130
return $this;
131131
}
132132

133-
/**
134-
* Work on application, so that it has all and only $fixtures applied. May require reinstall, if
135-
* excessive fixtures has been applied before.
136-
*
137-
* @param array $fixtures
138-
*
139-
* @return void
140-
*/
141-
public function applyFixtures(array $fixtures)
142-
{
143-
// Apply fixtures
144-
$fixturesToApply = array_diff($fixtures, $this->_fixtures);
145-
if (!$fixturesToApply) {
146-
return;
147-
}
148-
149-
$this->_bootstrap();
150-
foreach ($fixturesToApply as $fixtureFile) {
151-
$this->applyFixture($fixtureFile);
152-
}
153-
$this->_fixtures = $fixtures;
154-
155-
$this->reindex()
156-
->_updateFilesystemPermissions();
157-
}
158-
159-
160133
/**
161134
* Load fixtures
162135
*
@@ -203,18 +176,6 @@ public function getFixtures()
203176
return $this->_fixtures;
204177
}
205178

206-
/**
207-
* Apply fixture file
208-
*
209-
* @param string $fixtureFilename
210-
*
211-
* @return void
212-
*/
213-
public function applyFixture($fixtureFilename)
214-
{
215-
require $fixtureFilename;
216-
}
217-
218179
/**
219180
* Get object manager
220181
*

dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ApplicationTest.php

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

dev/tools/performance-toolkit/generate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
$shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer(), $logger);
3131

32-
$application = new \Magento\ToolkitFramework\Application($applicationBaseDir, $shell);
32+
$application = new \Magento\ToolkitFramework\Application($applicationBaseDir, $shell, []);
3333
$application->bootstrap();
3434
$application->loadFixtures();
3535

0 commit comments

Comments
 (0)