Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-47301-PHP7-Integration-Test-Syntax

mazhalai · mazhalai · commit f717ecf04a9a · 2016-01-11T15:09:32.000-06:00
diff --git a/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php b/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php
@@ -69,6 +69,7 @@ protected function _deallocateUnusedMemory()
     protected function _getAllowedMemoryUsage()
     {
         // Memory usage limits should not be further increased, corresponding memory leaks have to be fixed instead!
-        return \Magento\TestFramework\Helper\Memory::convertToBytes('1M');
+        // @todo fix memory leak and decrease limit to 1 M (in scope of MAGETWO-47693 limit was temporary increased)
+        return \Magento\TestFramework\Helper\Memory::convertToBytes('2M');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ protected function _deallocateUnusedMemory()`
`69`	`69`	`protected function _getAllowedMemoryUsage()`
`70`	`70`	`{`
`71`	`71`	`// Memory usage limits should not be further increased, corresponding memory leaks have to be fixed instead!`
`72`		`- return \Magento\TestFramework\Helper\Memory::convertToBytes('1M');`
	`72`	`+ // @todo fix memory leak and decrease limit to 1 M (in scope of MAGETWO-47693 limit was temporary increased)`
	`73`	`+ return \Magento\TestFramework\Helper\Memory::convertToBytes('2M');`
`73`	`74`	`}`
`74`	`75`	`}`