MC-6273: Mysql url_rewrite select make on product view page 170+ times per request

- fixed integration tests

Author: vgoncharenko

dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php

@@ -30,7 +30,7 @@ public function testGetFormHtml()
         $expectedHtml = '<b>html</b>';
         $this->assertNotEquals($expectedHtml, $block->getFormHtml());
         $form->setText($expectedHtml);
-        $this->assertEquals('', $block->getFormHtml());
+        $this->assertEquals($expectedHtml, $block->getFormHtml());
     }
 
     public function testPseudoConstruct()

lib/internal/Magento/Framework/Lock/Backend/Cache.php

@@ -37,22 +37,31 @@ public function __construct(FrontendInterface $cache)
      */
     public function lock(string $name, int $timeout = -1): bool
     {
-        return $this->cache->save('1', self::LOCK_PREFIX . $name, [], $timeout);
+        return $this->cache->save('1', $this->getIdentifier($name), [], $timeout);
     }
 
     /**
      * @inheritdoc
      */
     public function unlock(string $name): bool
     {
-        return $this->cache->remove(self::LOCK_PREFIX . $name);
+        return $this->cache->remove($this->getIdentifier($name));
     }
 
     /**
      * @inheritdoc
      */
     public function isLocked(string $name): bool
     {
-        return (bool)$this->cache->test(self::LOCK_PREFIX . $name);
+        return (bool)$this->cache->test($this->getIdentifier($name));
+    }
+
+    /**
+     * @param string $name
+     * @return string
+     */
+    private function getIdentifier(string $name): string
+    {
+        return self::LOCK_PREFIX . $name;
     }
 }

lib/internal/Magento/Framework/View/Element/AbstractBlock.php

@@ -686,7 +686,7 @@ public function toHtml()
         ]);
         $html = $transportObject->getHtml();
 
-        return (string)$html;
+        return $html;
     }
 
     /**