#12259: Save and Duplicated product not working

Author: p-bystritsky

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CopierTest.php

@@ -58,10 +58,33 @@ public function testDoubleCopy()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
+        parent::setUp();
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->copier = $this->objectManager->get(Copier::class);
         $this->productRepository = $this->objectManager->get(ProductRepository::class);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $skus = [
+            'simple-1',
+            'simple-2'
+        ];
+        foreach ($skus as $sku) {
+            try {
+                $product = $this->productRepository->get($sku, false, null, true);
+                $this->productRepository->delete($product);
+            } catch (NoSuchEntityException $e) {
+            }
+        }
+        parent::tearDown();
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_rollback.php

@@ -3,21 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\Framework\Exception\NoSuchEntityException;
 
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Framework\Registry;
-use Magento\TestFramework\Helper\Bootstrap;
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
 
-/** @var Registry $registry */
-$registry = Bootstrap::getObjectManager()->get(Registry::class);
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var Collection $productCollection */
-$productCollection = Bootstrap::getObjectManager()->get(Product::class)->getCollection();
-$productCollection->delete();
-
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);