diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/cache/file.php | 4 | ||||
| -rw-r--r-- | tests/lib/helper.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 0880e7e1282..92b784bf8ea 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -87,7 +87,9 @@ class FileCache extends \Test_Cache { } protected function tearDown() { - $this->instance->remove('hack', 'hack'); + if ($this->instance) { + $this->instance->remove('hack', 'hack'); + } \OC_User::setUserId($this->user); \OC::$server->getConfig()->setSystemValue('cachedirectory', $this->datadir); diff --git a/tests/lib/helper.php b/tests/lib/helper.php index c2620896157..89a981e6e23 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -21,7 +21,7 @@ class Test_Helper extends \Test\TestCase { { return array( array('0 B', 0), - array('1 kB', 1024), + array('1 KB', 1024), array('9.5 MB', 10000000), array('1.3 GB', 1395864371), array('465.7 GB', 500000000000), @@ -63,7 +63,7 @@ class Test_Helper extends \Test\TestCase { function providesComputerFileSize(){ return [ [0.0, "0 B"], - [1024.0, "1 kB"], + [1024.0, "1 KB"], [1395864371.0, '1.3 GB'], [9961472.0, "9.5 MB"], [500041567437.0, "465.7 GB"], |