Skip to content

Commit 8a3adb1

Browse files
mazhalaimazhalai
committed
Merge remote-tracking branch 'ogresCE/MAGETWO-38216-Reduce-Travis-Execution-Time' into PR_Branch
2 parents d646f9d + e462d42 commit 8a3adb1

File tree

307 files changed

+2438
-967
lines changed

Some content is hidden

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

307 files changed

+2438
-967
lines changed

‎.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ php:
44
- 5.6
55
env:
66
- TEST_SUITE=unit
7-
- TEST_SUITE=integration
7+
- TEST_SUITE=integration_part_1
8+
- TEST_SUITE=integration_part_2
89
- TEST_SUITE=integration_integrity
910
- TEST_SUITE=static_phpcs
1011
- TEST_SUITE=static_annotation
@@ -32,7 +33,7 @@ before_script:
3233
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
3334
# Install MySQL 5.6, create DB for integration tests
3435
- >
35-
sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
36+
sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
3637
sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
3738
sudo apt-get autoremove;
3839
sudo apt-get autoclean;
@@ -50,10 +51,12 @@ script:
5051
# Unit tests
5152
- sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
5253
# Integration tests
53-
- sh -c "if [ '$TEST_SUITE' = 'integration' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist; fi"
54+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
55+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
56+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
5457
# Integration integrity tests
5558
- sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
5659
# Static tests [Code Style]
5760
- sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
5861
# Static tests [Code Style]
59-
- sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
62+
- sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
7373
* @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
7474
* @param \Magento\Framework\UrlInterface $urlBuilder
7575
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
76-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
76+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
7777
* @param array $data
7878
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7979
*/
@@ -87,7 +87,7 @@ public function __construct(
8787
\Magento\Framework\App\ProductMetadataInterface $productMetadata,
8888
\Magento\Framework\UrlInterface $urlBuilder,
8989
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
90-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
90+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
9191
array $data = []
9292
) {
9393
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

‎app/code/Magento/Backend/Helper/Dashboard/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class Data extends \Magento\Framework\App\Helper\AbstractHelper
1515
{
1616
/**
17-
* @var \Magento\Framework\Data\Collection\Db
17+
* @var \MagentoFrameworkDataCollectionAbstractDb
1818
*/
1919
protected $_stores;
2020

@@ -48,7 +48,7 @@ public function __construct(
4848
/**
4949
* Retrieve stores configured in system.
5050
*
51-
* @return \Magento\Framework\Data\Collection\Db
51+
* @return \MagentoFrameworkDataCollectionAbstractDb
5252
*/
5353
public function getStores()
5454
{

‎app/code/Magento/Backup/Model/Config/Backend/Cron.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Cron extends \Magento\Framework\App\Config\Value
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
3535
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3636
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
37-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
37+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
3838
* @param string $runModelPath
3939
* @param array $data
4040
*/
@@ -44,7 +44,7 @@ public function __construct(
4444
\Magento\Framework\App\Config\ScopeConfigInterface $config,
4545
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
4646
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
47-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
47+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
4848
$runModelPath = '',
4949
array $data = []
5050
) {

‎app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Creditmemo extends AbstractItems
2525
* @param \Magento\Framework\Filter\FilterManager $filterManager
2626
* @param \Magento\Framework\Stdlib\String $string
2727
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
28-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
28+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
2929
* @param array $data
3030
*/
3131
public function __construct(
@@ -36,7 +36,7 @@ public function __construct(
3636
\Magento\Framework\Filter\FilterManager $filterManager,
3737
\Magento\Framework\Stdlib\String $string,
3838
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
39-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
39+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
4040
array $data = []
4141
) {
4242
$this->string = $string;

‎app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Invoice extends AbstractItems
2626
* @param \Magento\Framework\Filter\FilterManager $filterManager
2727
* @param \Magento\Framework\Stdlib\String $coreString
2828
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
29-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
29+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
3030
* @param array $data
3131
*/
3232
public function __construct(
@@ -37,7 +37,7 @@ public function __construct(
3737
\Magento\Framework\Filter\FilterManager $filterManager,
3838
\Magento\Framework\Stdlib\String $coreString,
3939
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
40-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
40+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
4141
array $data = []
4242
) {
4343
$this->string = $coreString;

‎app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Shipment extends AbstractItems
2323
* @param \Magento\Framework\Filter\FilterManager $filterManager
2424
* @param \Magento\Framework\Stdlib\String $string
2525
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
26-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
26+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
2727
* @param array $data
2828
*/
2929
public function __construct(
@@ -34,7 +34,7 @@ public function __construct(
3434
\Magento\Framework\Filter\FilterManager $filterManager,
3535
\Magento\Framework\Stdlib\String $string,
3636
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
37-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
37+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
3838
array $data = []
3939
) {
4040
$this->string = $string;

‎app/code/Magento/Bundle/Model/Selection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ class Selection extends \Magento\Framework\Model\AbstractModel
4343
* @param \Magento\Framework\Registry $registry
4444
* @param \Magento\Catalog\Helper\Data $catalogData
4545
* @param \Magento\Bundle\Model\Resource\Selection $resource
46-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
46+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
4747
* @param array $data
4848
*/
4949
public function __construct(
5050
\Magento\Framework\Model\Context $context,
5151
\Magento\Framework\Registry $registry,
5252
\Magento\Catalog\Helper\Data $catalogData,
5353
\Magento\Bundle\Model\Resource\Selection $resource,
54-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
54+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
5555
array $data = []
5656
) {
5757
$this->_catalogData = $catalogData;

‎app/code/Magento/Bundle/Model/Source/Option/Type.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
3838
* @param AttributeValueFactory $customAttributeFactory
3939
* @param array $options
4040
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
41-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
41+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
4242
* @param array $data
4343
*/
4444
public function __construct(
@@ -48,7 +48,7 @@ public function __construct(
4848
AttributeValueFactory $customAttributeFactory,
4949
array $options,
5050
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
51-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
51+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
5252
array $data = []
5353
) {
5454
$this->options = $options;

‎app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

Lines changed: 60 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,11 @@ public function testSaveIfOptionIdIsNull()
286286
$optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
287287

288288
$optionIdsMap = [null, $optionId, $optionId];
289-
$optionMock->expects($this->any())->method('getOptionId')->willReturnCallback(function () use (&$optionIdsMap) {
290-
return array_shift($optionIdsMap);
291-
});
289+
$optionMock->expects($this->any())->method('getOptionId')->willReturnCallback(
290+
function () use (&$optionIdsMap) {
291+
return array_shift($optionIdsMap);
292+
}
293+
);
292294
$optionMock->expects($this->exactly(2))->method('getProductLinks')->willReturn([$linkedProductMock]);
293295

294296
$this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)->willReturnSelf();
@@ -364,21 +366,8 @@ public function testSaveExistingOption()
364366
$productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
365367
$productMock->expects($this->once())->method('getId')->willReturn($productId);
366368
$productMock->expects($this->any())->method('getSku')->willReturn($productSku);
367-
$optionMock = $this->getMock(
368-
'\Magento\Bundle\Model\Option',
369-
[
370-
'setStoreId',
371-
'setParentId',
372-
'getProductLinks',
373-
'getOptionId',
374-
'setOptionId',
375-
'setDefaultTitle',
376-
'getTitle'
377-
],
378-
[],
379-
'',
380-
false
381-
);
369+
370+
$optionMock = $this->createOptionMock();
382371
$optionMock->expects($this->once())->method('setStoreId')->with($storeId)->willReturnSelf();
383372
$optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
384373
$optionMock->expects($this->any())->method('getOptionId')->willReturn($optionId);
@@ -613,4 +602,57 @@ public function testGetListException()
613602
->willReturn($productMock);
614603
$this->assertEquals(['object'], $this->model->getList($productSku));
615604
}
605+
606+
/**
607+
* @return \PHPUnit_Framework_MockObject_MockObject
608+
*/
609+
private function createOptionMock()
610+
{
611+
$contextMock = $this->getMock('Magento\Framework\Model\Context', [], [], '', false);
612+
$registryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
613+
$extensionAttributesFactory = $this->getMock(
614+
'Magento\Framework\Api\ExtensionAttributesFactory',
615+
[],
616+
[],
617+
'',
618+
false
619+
);
620+
$attributeValueFactoryMock = $this->getMock('Magento\Framework\Api\AttributeValueFactory', [], [], '', false);
621+
$resourceMock = $this->getMock(
622+
'Magento\Framework\Model\Resource\Db\AbstractDb',
623+
[
624+
'_construct',
625+
'getIdFieldName'
626+
],
627+
[],
628+
'',
629+
false
630+
);
631+
$resourceCollectionMock = $this->getMockBuilder('Magento\Framework\Data\Collection\AbstractDb')
632+
->disableOriginalConstructor()
633+
->getMockForAbstractClass();
634+
$optionMock = $this->getMock(
635+
'Magento\Bundle\Model\Option',
636+
[
637+
'setStoreId',
638+
'setParentId',
639+
'getProductLinks',
640+
'getOptionId',
641+
'setOptionId',
642+
'setDefaultTitle',
643+
'getTitle'
644+
],
645+
[
646+
$contextMock,
647+
$registryMock,
648+
$extensionAttributesFactory,
649+
$attributeValueFactoryMock,
650+
$resourceMock,
651+
$resourceCollectionMock
652+
],
653+
'',
654+
true
655+
);
656+
return $optionMock;
657+
}
616658
}

0 commit comments

Comments
 (0)