Skip to content

Commit

Permalink
Merge pull request #3090 from owncloud/fix-sharing-tests
Browse files Browse the repository at this point in the history
[tests-only] Fix sharing tests in parallel deployment tests
  • Loading branch information
saw-jan committed Feb 3, 2022
2 parents 9923f1f + 83a5d2d commit 9b66eb0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
3 changes: 0 additions & 3 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -1954,13 +1954,10 @@ def pipelineSanityChecks(ctx, pipelines):
"""

#images
OC_OCIS = "owncloud/ocis:latest"
OC_OC10 = "owncloud/server:10"
OC_UBUNTU = "owncloud/ubuntu:18.04"
MARIADB = "mariadb:10.6"
OSIXIA_OPENLDAP = "osixia/openldap:latest"
QUAY_IO_KEYCLOAK = "quay.io/keycloak/keycloak:latest"
POSTGRES = "postgres:alpine"

# configs
OCIS_URL = "https://ocis-server:9200"
Expand Down
4 changes: 0 additions & 4 deletions tests/parallelDeployAcceptance/expected-failures-API.md
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
## Scenarios that are expected to fail in parallel deployment

#### [[WIP] Add a SharesStorageProvider and an oc10 sql share manager](https://github.com/owncloud/ocis/pull/2232)

- [apiShareManagement/acceptShares.feature:22](https://github.com/owncloud/ocis/blob/master/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature#L22)
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Sharing tests currently doesn't work
# Accessing oc10 shares from ocis still WIP in PR #2232
# https://github.com/owncloud/ocis/pull/2232
@api
Feature: sharing files and folders
As a user
Expand All @@ -22,7 +19,7 @@ Feature: sharing files and folders
Scenario: accept a pending share
Given user "Alice" has shared folder "/textfile.txt" with user "Brian"
And using "ocis" as owncloud selector
When user "Brian" accepts share "/textfile.txt" offered by user "Alice" using the sharing API
When user "Brian" accepts share "/Shares/textfile.txt" offered by user "Alice" using the sharing API
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And the sharing API should report to user "Brian" that these shares are in the accepted state
Expand Down

0 comments on commit 9b66eb0

Please sign in to comment.