Merge remote-tracking branch 'origin/MAGETWO-23407-memory-usage-test' into PR_Branch

Olga Kopylova · Olga Kopylova · commit 9be21412222e · 2015-03-19T17:17:51.000-05:00
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php
@@ -39,7 +39,7 @@ public function clearCache()
     {
         foreach ($this->_classesToDestruct as $className) {
             if (isset($this->_sharedInstances[$className])) {
-                $this->_sharedInstances[$className]->__destruct();
+                $this->_sharedInstances[$className] = null;
             }
         }
 
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
@@ -13,9 +13,9 @@
     <!-- Test suites definition -->
     <testsuites>
         <!-- Memory tests run first to prevent influence of other tests on accuracy of memory measurements -->
-        <!--<testsuite name="Memory Usage Tests">-->
-            <!--<file>testsuite/Magento/MemoryUsageTest.php</file>-->
-        <!--</testsuite>-->
+        <testsuite name="Memory Usage Tests">
+            <file>testsuite/Magento/MemoryUsageTest.php</file>
+        </testsuite>
         <testsuite name="Magento Integration Tests">
             <directory suffix="Test.php">testsuite</directory>
             <exclude>testsuite/Magento/Test/Integrity</exclude>

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function clearCache()`
`39`	`39`	`{`
`40`	`40`	`foreach ($this->_classesToDestruct as $className) {`
`41`	`41`	`if (isset($this->_sharedInstances[$className])) {`
`42`		`- $this->_sharedInstances[$className]->__destruct();`
	`42`	`+ $this->_sharedInstances[$className] = null;`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`