MC-31920: Let Magento\Framework\Lock\Backend\Database have 2 locks in single connection

- Fix integration tests with creation of DB lock manager via new instead of dummy locker;

Author: adifucan

dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php

@@ -7,6 +7,9 @@
 
 namespace Magento\Framework\Lock\Backend;
 
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\DeploymentConfig;
+
 /**
  * \Magento\Framework\Lock\Backend\Database test case
  */
@@ -25,7 +28,10 @@ class DatabaseTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\Database::class);
+        $resourceConnection = $this->objectManager->create(ResourceConnection::class);
+        $deploymentConfig = $this->objectManager->create(DeploymentConfig::class);
+        // create object with new otherwise dummy locker is created because of di.xml preference for integration tests
+        $this->model = new Database($resourceConnection, $deploymentConfig);
     }
 
     public function testLockAndUnlock()

dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\MessageQueue\Model\Cron;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Lock\Backend\Database;
 use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
 use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\App\DeploymentConfig\FileReader;
@@ -83,7 +86,10 @@ protected function setUp()
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->shellMock = $this->getMockBuilder(ShellInterface::class)
             ->getMockForAbstractClass();
-        $this->lockManager = $this->objectManager->get(LockManagerInterface::class);
+        $resourceConnection = $this->objectManager->create(ResourceConnection::class);
+        $deploymentConfig = $this->objectManager->create(DeploymentConfig::class);
+        // create object with new otherwise dummy locker is created because of di.xml preference for integration tests
+        $this->lockManager = new Database($resourceConnection, $deploymentConfig);
         $this->consumerConfig = $this->objectManager->get(ConsumerConfigInterface::class);
         $this->reader = $this->objectManager->get(FileReader::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);