diff options
| author | Thomas Pulzer <t.pulzer@kniel.de> | 2016-07-04 11:50:32 +0200 |
|---|---|---|
| committer | Thomas Pulzer <t.pulzer@kniel.de> | 2016-07-04 11:50:32 +0200 |
| commit | 90b7f74da714209ee9c6a9a3243dacbaee2dc435 (patch) | |
| tree | 399f35c9ce80df45b39217f982535249aa3398ca /tests | |
| parent | 978ab660f737edbc38e7847f86e6106fb456dcb7 (diff) | |
| download | nextcloud-server-90b7f74da714209ee9c6a9a3243dacbaee2dc435.tar.gz nextcloud-server-90b7f74da714209ee9c6a9a3243dacbaee2dc435.zip | |
Changed name of default logfile from owncloud.log to nextcloud.log.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Core/Command/Log/OwnCloudTest.php | 4 | ||||
| -rw-r--r-- | tests/lib/TestCase.php | 2 | ||||
| -rwxr-xr-x | tests/travis/install.sh | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/Core/Command/Log/OwnCloudTest.php b/tests/Core/Command/Log/OwnCloudTest.php index 3cb05221c37..e0445a5cfda 100644 --- a/tests/Core/Command/Log/OwnCloudTest.php +++ b/tests/Core/Command/Log/OwnCloudTest.php @@ -101,7 +101,7 @@ class OwnCloudTest extends TestCase { ->will($this->returnValueMap([ ['log_type', 'owncloud', 'log_type_value'], ['datadirectory', \OC::$SERVERROOT.'/data', '/data/directory/'], - ['logfile', '/data/directory/owncloud.log', '/var/log/owncloud.log'], + ['logfile', '/data/directory/nextcloud.log', '/var/log/nextcloud.log'], ['log_rotate_size', 0, 5 * 1024 * 1024], ])); @@ -110,7 +110,7 @@ class OwnCloudTest extends TestCase { ->with('Log backend ownCloud: disabled'); $this->consoleOutput->expects($this->at(1)) ->method('writeln') - ->with('Log file: /var/log/owncloud.log'); + ->with('Log file: /var/log/nextcloud.log'); $this->consoleOutput->expects($this->at(2)) ->method('writeln') ->with('Rotate at: 5 MB'); diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index a1f65f8ac82..514cb6ea3a5 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -269,7 +269,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { */ static protected function tearDownAfterClassCleanStrayDataFiles($dataDir) { $knownEntries = array( - 'owncloud.log' => true, + 'nextcloud.log' => true, 'owncloud.db' => true, '.ocdata' => true, '..' => true, diff --git a/tests/travis/install.sh b/tests/travis/install.sh index fe7907f798c..180e0c634da 100755 --- a/tests/travis/install.sh +++ b/tests/travis/install.sh @@ -173,8 +173,8 @@ cat $BASEDIR/config/config.php echo "data directory:" ls -ll $DATADIR -echo "owncloud.log:" -[ -f "$DATADIR/owncloud.log" ] && cat $DATADIR/owncloud.log -[ -f "$BASEDIR/data/owncloud.log" ] && cat $BASEDIR/data/owncloud.log +echo "nextcloud.log:" +[ -f "$DATADIR/nextcloud.log" ] && cat $DATADIR/nextcloud.log +[ -f "$BASEDIR/data/nextcloud.log" ] && cat $BASEDIR/data/nextcloud.log cd $BASEDIR |