Merge branch 'MAGETWO-84100' of https://github.com/magento-trigger/magento2ce into MAGETWO-84100

Sergii Kovalenko · Sergii Kovalenko · commit eddf58e3b0c1 · 2018-02-01T12:26:11.000+02:00
diff --git a/app/code/Magento/Framework/Test/Unit/Setup/SchemaListenerTest.php b/app/code/Magento/Framework/Test/Unit/Setup/SchemaListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Framework/Test/Unit/Setup/SchemaPersistorTest.php b/app/code/Magento/Framework/Test/Unit/Setup/SchemaPersistorTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Quote/Test/Unit/Setup/QuoteSetupTest.php b/app/code/Magento/Quote/Test/Unit/Setup/QuoteSetupTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Test\Unit\Setup;
 
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
diff --git a/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php b/app/code/Magento/Sales/Test/Unit/Setup/SalesSetupTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Setup;
 
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
@@ -90,6 +90,8 @@ public function testUpdateTime(array $blockData)
         $storeId = reset($blockData['stores']);
         $block   = $this->blockIdentifier->execute($blockData['identifier'], $storeId);
         $date    = $this->objectManager->get(DateTime::class)->date();
+        $this->markTestIncomplete('MAGETWO-87353: \Magento\Cms\Model\BlockTest::testUpdateTime randomly fails on CI. '
+            . 'Invalid assertion. Application node timestamp may significantly differ from DB node.');
         $this->assertEquals($date, $block->getUpdateTime());
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/SchemaBuilderTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/SchemaBuilderTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db;
 
 use Magento\Framework\App\ResourceConnection;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/StatementAggregatorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/StatementAggregatorTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Declaration/SchemaBuilderTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Declaration/SchemaBuilderTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Declaration;
 
 use Magento\Framework\App\ResourceConnection;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Diff/DiffManagerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Diff/DiffManagerTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Diff;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Operations/AddColumnTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Operations/AddColumnTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Operations;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/OperationsExecutorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/OperationsExecutorTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ShardingTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ShardingTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Test\Unit\Model\Declaration\Schema;
 
 use Magento\Framework\App\DeploymentConfig;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Declaration\ValidationRules;
+
+namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\ValidationRules;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex;
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/RealTypesTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/RealTypesTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Declaration\ValidationRules;
+
+namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\ValidationRules;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\RealTypes;

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,8 @@ public function testUpdateTime(array $blockData)`
`90`	`90`	`$storeId = reset($blockData['stores']);`
`91`	`91`	`$block = $this->blockIdentifier->execute($blockData['identifier'], $storeId);`
`92`	`92`	`$date = $this->objectManager->get(DateTime::class)->date();`
	`93`	`+ $this->markTestIncomplete('MAGETWO-87353: \Magento\Cms\Model\BlockTest::testUpdateTime randomly fails on CI. '`
	`94`	`+ . 'Invalid assertion. Application node timestamp may significantly differ from DB node.');`
`93`	`95`	`$this->assertEquals($date, $block->getUpdateTime());`
`94`	`96`	`}`
`95`	`97`