wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change resharing to local instead of remote because of a deadlock

Browse source
This commit is contained in:
Sergio Bertolin 2016-03-11 08:32:40 +00:00
parent 44da5fe1ab
commit c153a27ce5
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build/integration/federation_features/federated.feature
View file

@ -86,23 +86,28 @@ Feature: federated
Then the OCS status code should be "100" Then the OCS status code should be "100"
And the HTTP status code should be "200" And the HTTP status code should be "200"
Scenario: Federate reshare a file Scenario: Reshare a federated shared file
Given Using server "REMOTE" Given Using server "REMOTE"
And user "user1" exists And user "user1" exists
And user "user2" exists
And Using server "LOCAL" And Using server "LOCAL"
And user "user0" exists And user "user0" exists
And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE"
And User "user1" from server "REMOTE" accepts last pending share And User "user1" from server "REMOTE" accepts last pending share
And Using server "REMOTE" And Using server "REMOTE"
And As an "user1" And As an "user1"
When User "user1" from server "REMOTE" shares "/textfile0 (2).txt" with user "user0" from server "LOCAL" When creating a share with
| path | /textfile0 (2).txt |
| shareType | 0 |
| shareWith | user2 |
| permissions | 19 |
Then the OCS status code should be "100" Then the OCS status code should be "100"
And the HTTP status code should be "200" And the HTTP status code should be "200"
And Share fields of last share match with And Share fields of last share match with
| id | A_NUMBER | | id | A_NUMBER |
| item_type | file | | item_type | file |
| item_source | A_NUMBER | | item_source | A_NUMBER |
| share_type | 6 | | share_type | 0 |
| file_source | A_NUMBER | | file_source | A_NUMBER |
| path | /textfile0 (2).txt | | path | /textfile0 (2).txt |
| permissions | 19 | | permissions | 19 |
@ -112,8 +117,8 @@ Feature: federated
| uid_owner | user1 | | uid_owner | user1 |
| file_parent | A_NUMBER | | file_parent | A_NUMBER |
| displayname_owner | user1 | | displayname_owner | user1 |
| share_with | user0@LOCAL | | share_with | user2 |
| share_with_displayname | user0@LOCAL | | share_with_displayname | user2 |