diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-11 16:29:00 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-11 16:29:00 +0200 |
| commit | 3333c4c0b9476eb35ac6a41727b06f628c6bda2d (patch) | |
| tree | dcf29bc128a9861c3f97e53e4cec4dc8f7d24037 /apps | |
| parent | 8729415880181275c9d4a05707273e13c9cf7e1b (diff) | |
| parent | 8bfa532075a1d755ed9e3031286b6f255d0abed2 (diff) | |
| download | nextcloud-server-3333c4c0b9476eb35ac6a41727b06f628c6bda2d.tar.gz nextcloud-server-3333c4c0b9476eb35ac6a41727b06f628c6bda2d.zip | |
Merge pull request #24568 from owncloud/fix_24566
Fix etag propegation test race condition
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/tests/etagpropagation.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php index 2f3604e63cd..e7d5bb46258 100644 --- a/apps/files_sharing/tests/etagpropagation.php +++ b/apps/files_sharing/tests/etagpropagation.php @@ -192,7 +192,8 @@ class EtagPropagation extends PropagationTestCase { public function testOwnerWritesToSingleFileShare() { $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1); Filesystem::file_put_contents('/foo.txt', 'longer_bar'); - Filesystem::touch('/foo.txt', time() - 1); + $t = (int)Filesystem::filemtime('/foo.txt') - 1; + Filesystem::touch('/foo.txt', $t); $this->assertEtagsNotChanged([self::TEST_FILES_SHARING_API_USER4, self::TEST_FILES_SHARING_API_USER3]); $this->assertEtagsChanged([self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER2]); |