diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-11-26 00:47:22 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-11-26 00:47:22 +0100 |
| commit | e9696a8c9a200a7078a07826141dc81b0a9dd919 (patch) | |
| tree | 9c9c3b06e774a4852c1a3beaa6e82d00f5cc2b3d /tests | |
| parent | e6a7022037086317e235cd703420c7a503bc44e4 (diff) | |
| parent | 5d4b7e0e2b789e47a51dd7d047599dd9f8701e60 (diff) | |
| download | nextcloud-server-e9696a8c9a200a7078a07826141dc81b0a9dd919.tar.gz nextcloud-server-e9696a8c9a200a7078a07826141dc81b0a9dd919.zip | |
Merge pull request #12420 from owncloud/sqlite-wal-2
adding new config parameter for sqlite to specify the journal mode
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/tempmanager.php | 4 | ||||
| -rw-r--r-- | tests/preseed-config.php | 33 |
2 files changed, 18 insertions, 19 deletions
diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php index 05311e820a7..c030eef2c9e 100644 --- a/tests/lib/tempmanager.php +++ b/tests/lib/tempmanager.php @@ -27,7 +27,7 @@ class TempManager extends \Test\TestCase { protected function setUp() { parent::setUp(); - $this->baseDir = get_temp_dir() . '/oc_tmp_test'; + $this->baseDir = get_temp_dir() . $this->getUniqueID('/oc_tmp_test'); if (!is_dir($this->baseDir)) { mkdir($this->baseDir); } @@ -39,7 +39,7 @@ class TempManager extends \Test\TestCase { } /** - * @param \Psr\Log\LoggerInterface $logger + * @param \OCP\ILogger $logger * @return \OC\TempManager */ protected function getManager($logger = null) { diff --git a/tests/preseed-config.php b/tests/preseed-config.php index 3fd5b3cb7fc..3f41573bf29 100644 --- a/tests/preseed-config.php +++ b/tests/preseed-config.php @@ -1,22 +1,21 @@ <?php $CONFIG = array ( - "appstoreenabled" => false, - 'apps_paths' => - array ( - 0 => - array ( - 'path' => OC::$SERVERROOT.'/apps', - 'url' => '/apps', - 'writable' => true, - ), - 1 => - array ( - 'path' => OC::$SERVERROOT.'/apps2', - 'url' => '/apps2', - 'writable' => false, - ) - ), - + "appstoreenabled" => false, + 'apps_paths' => + array ( + 0 => + array ( + 'path' => OC::$SERVERROOT.'/apps', + 'url' => '/apps', + 'writable' => true, + ), + 1 => + array ( + 'path' => OC::$SERVERROOT.'/apps2', + 'url' => '/apps2', + 'writable' => false, + ) + ), ); if(substr(strtolower(PHP_OS), 0, 3) == "win") { |