Skip to content

Add conditional delay to avoid same stime in int test #28310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeepDiver1975 merged 1 commit into from
Jul 6, 2017
Merged

Add conditional delay to avoid same stime in int test #28310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions tests/integration/features/bootstrap/Sharing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ trait Sharing {
/** @var int */
private $savedShareId = null;

/** @var int */
private $lastShareTime = null;

/**
* @Given /^as "([^"]*)" creating a share with$/
* @param string $user
Expand Down Expand Up @@ -425,6 +428,14 @@ public function assureFileIsShared($entry, $filepath, $user1, $user2, $withPerms
if ($this->isUserOrGroupInSharedData($user2, $permissions)){
return;
} else {
$time = time();
if ($this->lastShareTime !== null && $time - $this->lastShareTime < 1) {
// prevent creating two shares with the same "stime" which is based on
// seconds, this affects share merging order and could affect expected test
// result order
sleep(1);
}
$this->lastShareTime = $time;
$this->createShare($user1, $filepath, 0, $user2, null, null, $permissions);
}
$this->response = $client->get($fullUrl, $options);
Expand Down