Merge pull request #10387 from owncloud/quick_fix_for_unit_tests

don't clean up the test environment if a data provider was finished

tests/testcleanuplistener.php

@@ -41,20 +41,23 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
 	}
 
 	public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
-		if ($this->cleanStorages() && $this->isShowSuiteWarning()) {
+		// don't clean up the test environment if a data provider finished
-			printf("TestSuite '%s': Did not clean up storages\n", $suite->getName());
+		if (!($suite instanceof PHPUnit_Framework_TestSuite_DataProvider)) {
-		}
+			if ($this->cleanStorages() && $this->isShowSuiteWarning()) {
-		if ($this->cleanFileCache() && $this->isShowSuiteWarning()) {
+				printf("TestSuite '%s': Did not clean up storages\n", $suite->getName());
-			printf("TestSuite '%s': Did not clean up file cache\n", $suite->getName());
+			}
-		}
+			if ($this->cleanFileCache() && $this->isShowSuiteWarning()) {
-		if ($this->cleanStrayDataFiles() && $this->isShowSuiteWarning()) {
+				printf("TestSuite '%s': Did not clean up file cache\n", $suite->getName());
-			printf("TestSuite '%s': Did not clean up data dir\n", $suite->getName());
+			}
-		}
+			if ($this->cleanStrayDataFiles() && $this->isShowSuiteWarning()) {
-		if ($this->cleanStrayHooks() && $this->isShowSuiteWarning()) {
+				printf("TestSuite '%s': Did not clean up data dir\n", $suite->getName());
-			printf("TestSuite '%s': Did not clean up hooks\n", $suite->getName());
+			}
-		}
+			if ($this->cleanStrayHooks() && $this->isShowSuiteWarning()) {
-		if ($this->cleanProxies() && $this->isShowSuiteWarning()) {
+				printf("TestSuite '%s': Did not clean up hooks\n", $suite->getName());
-			printf("TestSuite '%s': Did not clean up proxies\n", $suite->getName());
+			}
+			if ($this->cleanProxies() && $this->isShowSuiteWarning()) {
+				printf("TestSuite '%s': Did not clean up proxies\n", $suite->getName());
+			}
 		}
 	}