Skip to content

Commit 6b58697

Browse files
author
Michael Logvin
committed
MAGETWO-33053: MTF Configuration pull request
1 parent 12f8b41 commit 6b58697

File tree

3 files changed

+6
-22
lines changed

3 files changed

+6
-22
lines changed

dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,6 @@ public function create(array $sharedInstances = [])
6464
return $objectManager;
6565
}
6666

67-
/**
68-
* Create instance of application deployment config
69-
*
70-
* @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList
71-
* @param array $arguments
72-
* @return \Magento\Framework\App\DeploymentConfig
73-
*/
74-
protected function createDeploymentConfig(
75-
\Magento\Framework\App\Filesystem\DirectoryList $directoryList,
76-
array $arguments
77-
) {
78-
$data = isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
79-
? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
80-
: null;
81-
return new \Magento\Framework\App\DeploymentConfig(
82-
new \Magento\Framework\App\DeploymentConfig\Reader($directoryList),
83-
$data
84-
);
85-
}
86-
8767
/**
8868
* Return newly created instance on an argument interpreter, suitable for processing DI arguments
8969
*

dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@ protected function collectItems($type)
171171
);
172172
foreach ($dirIterator as $info) {
173173
/** @var $info \SplFileInfo */
174-
$this->_processItem($items, $rewrites, $info->getRealPath(), $location, $path);
174+
$realPath = $info->getPathname();
175+
if (is_link($realPath)) {
176+
$realPath = readlink($realPath);
177+
}
178+
$this->_processItem($items, $rewrites, $realPath, $location, $path);
175179
}
176180
}
177181
}

dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CollectionProvider implements CollectionProviderInterface
2020
protected $objectManager;
2121

2222
/**
23-
* Magetno resource instance.
23+
* Magento resource instance.
2424
*
2525
* @var \Magento\Framework\App\Resource
2626
*/

0 commit comments

Comments
 (0)