Merge remote-tracking branch 'tango-ce/MAGETWO-36572' into MAGETWO-37436

Author: Yuri Kovsher

dev/tests/integration/testsuite/Magento/Framework/View/LayoutDirectivesTest.php

@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework\View;
 
-use Magento\Framework\View\Layout\BuilderFactory;
+use Magento\Framework\App\State;
 
 class LayoutDirectivesTest extends \PHPUnit_Framework_TestCase
 {
@@ -26,10 +26,16 @@ class LayoutDirectivesTest extends \PHPUnit_Framework_TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    protected $state;
+
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->layoutFactory = $this->objectManager->get('Magento\Framework\View\LayoutFactory');
+        $this->state = $this->objectManager->get('Magento\Framework\App\State');
     }
 
     /**
@@ -223,11 +229,11 @@ public function testMoveAliasBroken()
         $this->_getLayoutModel('move_alias_broken.xml');
     }
 
-    /**
-     * @expectedException \OutOfBoundsException
-     */
     public function testRemoveBroken()
     {
+        if ($this->state->getMode() === State::MODE_DEVELOPER) {
+            $this->setExpectedException('OutOfBoundsException');
+        }
         $this->_getLayoutModel('remove_broken.xml');
     }