clean up test log files, whitelist shm database file

blizzz · blizzz · commit 0dd2621109e7 · 2018-06-29T15:00:10.000+02:00
Signed-off-by: Arthur Schiwon &lt;blizzz@arthur-schiwon.de&gt;
diff --git a/tests/lib/Log/FileTest.php b/tests/lib/Log/FileTest.php
@@ -55,7 +55,9 @@ protected function tearDown() {
 		} else {
 			$config->deleteValue("logdateformat");
 		}
+		$testLogPath = $this->logFile->getLogFilePath();
 		$this->logFile = new File($this->restore_logfile, '', $config);
+		unlink($testLogPath);
 		parent::tearDown();
 	}
 	
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
@@ -301,6 +301,7 @@ static protected function tearDownAfterClassCleanStrayDataFiles($dataDir) {
 			'nextcloud.log' => true,
 			'audit.log' => true,
 			'owncloud.db' => true,
+			'owncloud.db-shm' => true,
 			'.ocdata' => true,
 			'..' => true,
 			'.' => true,

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,9 @@ protected function tearDown() {`
`55`	`55`	`} else {`
`56`	`56`	`$config->deleteValue("logdateformat");`
`57`	`57`	`}`
	`58`	`+ $testLogPath = $this->logFile->getLogFilePath();`
`58`	`59`	`$this->logFile = new File($this->restore_logfile, '', $config);`
	`60`	`+ unlink($testLogPath);`
`59`	`61`	`parent::tearDown();`
`60`	`62`	`}`
`61`	`63`