Skip to content

fix: CI, potential test flakiness improvements #12768

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

Draft
mklos-kw wants to merge 1 commit into
base: master
Choose a base branch
from
+56 −1
Draft

fix: CI, potential test flakiness improvements #12768

Show file tree
Hide file tree
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
12 changes: 11 additions & 1 deletion tests/acceptance/bootstrap/CollaborationContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,17 @@ public function userCreatesFileInsideFolderInSpaceUsingWopiEndpoint(
string $folder,
string $space,
): void {
$parentContainerId = $this->spacesContext->getResourceId($user, $space, $folder);
// getResourceId does a single PROPFIND; after a share invite the xattr grant
// may not be visible yet, so retry until oc:fileid is non-empty.
$retried = 0;
do {
$parentContainerId = $this->spacesContext->getResourceId($user, $space, $folder);
$tryAgain = empty($parentContainerId) && $retried < HttpRequestHelper::maxHTTPRequestRetries();
if ($tryAgain) {
$retried += 1;
\usleep(500 * 1000);
}
} while ($tryAgain);
$this->featureContext->setResponse(
CollaborationHelper::createFile(
$this->featureContext->getBaseUrl(),
Expand Down
43 changes: 43 additions & 0 deletions tests/acceptance/bootstrap/SharingNgContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,6 +1739,49 @@ public function userHasShareSynced(string $user, string $resource): void {
$this->waitAndCheckShareSyncStatus($user, $resource, "enabled");
}

/**
* @Given /^user "([^"]*)" has a share "([^"]*)" accessible via WebDAV$/
*
* Waits until the share mount point is reachable via WebDAV PROPFIND (HTTP 207).
* This is a storage-layer readiness check that complements userHasShareSynced,
* which only checks the JSON share-manager state. The xattr grant written by
* AddGrant may still be propagating when the share-manager state already reads
* ACCEPTED, so resolveAcceptedShare's Stat call can fail transiently without
* this extra gate.
*
* @param string $user
* @param string $resource
*
* @return void
* @throws GuzzleException
*/
public function userHasShareAccessibleViaWebDAV(string $user, string $resource): void {
$resource = \trim($resource, '/');
$davPath = WebDavHelper::getDavPath(WebDavHelper::DAV_VERSION_NEW, $user);
$baseUrl = $this->featureContext->getBaseUrl();
$password = $this->featureContext->getPasswordForUser($user);

$retried = 0;
do {
$response = HttpRequestHelper::sendRequest(
"$baseUrl/$davPath/Shares/$resource",
'PROPFIND',
$user,
$password,
['Depth' => '0'],
);
if ($response->getStatusCode() === 207) {
return;
}
$tryAgain = $retried < HttpRequestHelper::maxHTTPRequestRetries();
if ($tryAgain) {
$retried += 1;
\usleep(500 * 1000);
}
} while ($tryAgain);
Assert::fail("[Timeout] Share '$resource' for user '$user' not accessible via WebDAV after retries");
}

/**
* @Then /^user "([^"]*)" should have sync (enabled|disabled) for share "([^"]*)"$/
*
Expand Down
2 changes: 2 additions & 0 deletions tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Feature: sharing
| shareType | user |
| permissionsRole | <permissions-role> |
And user "Carol" has a share "sharefile.txt" synced
And user "Carol" has a share "sharefile.txt" accessible via WebDAV
When user "Carol" moves file "Shares/sharefile.txt" to "Shares/renamedsharefile.txt" using the WebDAV API
Then the HTTP status code should be "201"
And as "Carol" file "Shares/renamedsharefile.txt" should exist
Expand Down Expand Up @@ -149,6 +150,7 @@ Feature: sharing
| shareType | user |
| permissionsRole | <permissions-role> |
And user "Carol" has a share "sharefile.txt" synced
And user "Carol" has a share "sharefile.txt" accessible via WebDAV
When user "Carol" moves file "Shares/sharefile.txt" to "Shares/renamedsharefile.txt" using the WebDAV API
Then the HTTP status code should be "201"
And as "Carol" file "Shares/renamedsharefile.txt" should exist
Expand Down
Loading