summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-10-19 15:48:49 +0200
committerVincent Petry <pvince81@owncloud.com>2015-10-26 15:41:23 +0100
commitf355d4e51a1b597d4e763a10e3ebadb925b0c779 (patch)
tree0b78741b73448d7399097f2059c96f666e6abf2d /tests
parentb900782513a750e5e100c7d55278632754a8df19 (diff)
downloadnextcloud-server-f355d4e51a1b597d4e763a10e3ebadb925b0c779.tar.gz
nextcloud-server-f355d4e51a1b597d4e763a10e3ebadb925b0c779.zip
Fix locking unit tests due to filemtime addition
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/view.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index a84b8badd5a..a7979146b85 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -1976,9 +1976,13 @@ class View extends \Test\TestCase {
$view = new \OC\Files\View('/' . $this->user . '/files/');
$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
- ->setMethods([$operation])
+ ->setMethods([$operation, 'filemtime'])
->getMock();
+ $storage->expects($this->any())
+ ->method('filemtime')
+ ->will($this->returnValue(123456789));
+
$sourcePath = 'original.txt';
$targetPath = 'target.txt';
@@ -2117,9 +2121,13 @@ class View extends \Test\TestCase {
->setMethods([$storageOperation])
->getMock();
$storage2 = $this->getMockBuilder('\OC\Files\Storage\Temporary')
- ->setMethods([$storageOperation])
+ ->setMethods([$storageOperation, 'filemtime'])
->getMock();
+ $storage2->expects($this->any())
+ ->method('filemtime')
+ ->will($this->returnValue(123456789));
+
$sourcePath = 'original.txt';
$targetPath = 'substorage/target.txt';