Skip to content

Add Circle to Caldav and Filepanel #12119

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

Jump to bottom
Merged
MorrisJobke merged 3 commits into from
Mar 14, 2019
Merged

Add Circle to Caldav and Filepanel #12119

MorrisJobke merged 3 commits into from
Mar 14, 2019

Conversation

@ArtificialOwl
Copy link
Member

@ArtificialOwl ArtificialOwl commented Oct 29, 2018

No description provided.

@ArtificialOwl ArtificialOwl added the 2. developing Work in progress label Oct 29, 2018
@MorrisJobke MorrisJobke added this to the Nextcloud 15 milestone Oct 29, 2018
@MorrisJobke MorrisJobke changed the title [NC15] Add Circle to Caldav and Filepanel Add Circle to Caldav and Filepanel Oct 29, 2018
@MorrisJobke

This comment has been minimized.

Sign in to view
@MorrisJobke MorrisJobke force-pushed the add_circle_to_caldav_and_filepanel-15 branch from 754deb3 to 9b9f448 Compare November 2, 2018 15:42
@MorrisJobke

This comment has been minimized.

Sign in to view
@ArtificialOwl ArtificialOwl added 3. to review Waiting for reviews high and removed 2. developing Work in progress labels Nov 2, 2018
MorrisJobke
MorrisJobke reviewed Nov 5, 2018
View reviewed changes
MorrisJobke
MorrisJobke reviewed Nov 5, 2018
View reviewed changes
MorrisJobke
MorrisJobke reviewed Nov 5, 2018
View reviewed changes
MorrisJobke
MorrisJobke reviewed Nov 5, 2018
View reviewed changes
MorrisJobke
MorrisJobke reviewed Nov 5, 2018
View reviewed changes
MorrisJobke
MorrisJobke reviewed Nov 5, 2018
View reviewed changes
@ArtificialOwl
Copy link
Member Author

ArtificialOwl commented Nov 6, 2018

Because this is not a clean solution (static call to an app) and that we have only few (one) bug report for this feature. Should we just disable the feature in Circles until we have a real integration of it in Core ?

Regards

This was referenced Nov 6, 2018
Merged
Closed
@MorrisJobke MorrisJobke modified the milestones: Nextcloud 15, Nextcloud 16 Nov 8, 2018
@nextcloud-bot nextcloud-bot mentioned this pull request Nov 29, 2018
Closed
@MorrisJobke MorrisJobke mentioned this pull request Mar 4, 2019
Merged
45 tasks
@MorrisJobke

This comment has been minimized.

Sign in to view
@MorrisJobke MorrisJobke mentioned this pull request Mar 6, 2019
Merged
9 tasks
@viniciuscb @MorrisJobke
Created infrastructure to show circles' shared files
9bb13fb 
There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it.

Issue: nextcloud/circles#137

Changes to comply to coletivoEITA/circles#2

Polishing: get files shared to circles in caldav

Signed-off-by: Vinicius Cubas Brand <[email protected]>
Signed-off-by: Maxence Lange <[email protected]>
Signed-off-by: Morris Jobke <[email protected]>
@MorrisJobke MorrisJobke force-pushed the add_circle_to_caldav_and_filepanel-15 branch from fceb9d0 to 9bb13fb Compare March 12, 2019 23:36
@MorrisJobke
Copy link
Member

MorrisJobke commented Mar 12, 2019

@daita I rebased and squashed the commits (because most of them were unnecessary due to #6512). I also added dependency injection for the app manager. Could you give this a good try?

@faily-bot
Copy link

faily-bot bot commented Mar 13, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16941: failure

DB=sqlite, ENABLE_REDIS=false, PHP=7.3

Show full log 
There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

--

There was 1 risky test:

1) OCA\TwoFactorBackupCodes\Tests\Db\BackupCodeMapperTest::testInsertArgonEncryptedCodes
This test did not perform any assertions

TESTS=integration-federation_features

  • build/integration/federation_features/federated.feature:183
  • build/integration/federation_features/federated.feature:232
  • build/integration/federation_features/federated.feature:247
  • build/integration/federation_features/federated.feature:263
Show full log 
[Tue Mar 12 23:45:24 2019] 127.0.0.1:47040 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Tue Mar 12 23:45:24 2019] 127.0.0.1:47042 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Reshare a federated shared file                                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:183
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
[Tue Mar 12 23:45:24 2019] 127.0.0.1:55404 [404]: /ocs/v2.php/cloud/users/user1
[Tue Mar 12 23:45:24 2019] 127.0.0.1:55408 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:24 2019] 127.0.0.1:55410 [200]: /ocs/v1.php/cloud/users/user1
[Tue Mar 12 23:45:24 2019] 127.0.0.1:55414 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
[Tue Mar 12 23:45:25 2019] 127.0.0.1:55416 [404]: /ocs/v2.php/cloud/users/user2
[Tue Mar 12 23:45:25 2019] 127.0.0.1:55418 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:25 2019] 127.0.0.1:55420 [200]: /ocs/v1.php/cloud/users/user2
[Tue Mar 12 23:45:25 2019] 127.0.0.1:55424 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
[Tue Mar 12 23:45:25 2019] 127.0.0.1:47066 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:45:25 2019] 127.0.0.1:47072 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47078 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47090 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
[Tue Mar 12 23:45:26 2019] 127.0.0.1:55458 [200]: /ocm-provider/
[Tue Mar 12 23:45:26 2019] 127.0.0.1:55460 [201]: /index.php/ocm/shares
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47094 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
[Tue Mar 12 23:45:26 2019] 127.0.0.1:55462 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47110 [200]: //ocm-provider/
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47112 [201]: /index.php/ocm/notifications
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47116 [200]: //ocs-provider/
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47118 [200]: /ocs/v2.php/cloud/shares/8/accept?format=json
[Tue Mar 12 23:45:26 2019] 127.0.0.1:55466 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/9
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47124 [200]: //ocs-provider/
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47126 [200]: //status.php
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47128 [200]: //status.php
[Tue Mar 12 23:45:26 2019] 127.0.0.1:47132 [200]: /index.php/apps/files_sharing/shareinfo?t=q04gvjouhFoYmED
[Tue Mar 12 23:45:26 2019] 127.0.0.1:55480 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    When creating a share with                                                                          # FederationContext::creatingShare()
      | path        | /textfile0 (2).txt |
      | shareType   | 0                  |
      | shareWith   | user2              |
      | permissions | 19                 |
    Then the OCS status code should be "100"                                                            # FederationContext::theOCSStatusCodeShouldBe()
      Failed asserting that SimpleXMLElement Object &00000000668a0bff000000006acddc6b (
          0 => '404'
      ) matches expected '100'.
    And the HTTP status code should be "200"                                                            # FederationContext::theHTTPStatusCodeShouldBe()
    And Share fields of last share match with                                                           # FederationContext::checkShareFields()
      | id                     | A_NUMBER           |
      | item_type              | file               |
      | item_source            | A_NUMBER           |
      | share_type             | 0                  |
      | file_source            | A_NUMBER           |
      | path                   | /textfile0 (2).txt |
      | permissions            | 19                 |
      | stime                  | A_NUMBER           |
      | storage                | A_NUMBER           |
      | mail_send              | 1                  |
      | uid_owner              | user1              |
      | file_parent            | A_NUMBER           |
      | displayname_owner      | user1              |
      | share_with             | user2              |
      | share_with_displayname | user2              |
[Tue Mar 12 23:45:27 2019] 127.0.0.1:47134 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:45:27 2019] 127.0.0.1:47168 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:45:28 2019] 127.0.0.1:47202 [200]: //ocm-provider/
[Tue Mar 12 23:45:28 2019] 127.0.0.1:47204 [400]: /index.php/ocm/notifications
[Tue Mar 12 23:45:28 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 8"}

[Tue Mar 12 23:45:48 2019] 127.0.0.1:47590 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Tue Mar 12 23:45:48 2019] 127.0.0.1:47592 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Overwrite a federated shared folder as recipient                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:232
    Given Using server "REMOTE"                                                                          # FederationContext::usingServer()
[Tue Mar 12 23:45:48 2019] 127.0.0.1:55954 [404]: /ocs/v2.php/cloud/users/user1
[Tue Mar 12 23:45:48 2019] 127.0.0.1:55956 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:49 2019] 127.0.0.1:55960 [200]: /ocs/v1.php/cloud/users/user1
[Tue Mar 12 23:45:49 2019] 127.0.0.1:55966 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                              # FederationContext::assureUserExists()
[Tue Mar 12 23:45:49 2019] 127.0.0.1:55968 [404]: /ocs/v2.php/cloud/users/user2
[Tue Mar 12 23:45:49 2019] 127.0.0.1:55972 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:50 2019] 127.0.0.1:55974 [200]: /ocs/v1.php/cloud/users/user2
[Tue Mar 12 23:45:50 2019] 127.0.0.1:55978 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                              # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                             # FederationContext::usingServer()
[Tue Mar 12 23:45:50 2019] 127.0.0.1:47620 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:45:50 2019] 127.0.0.1:47622 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:51 2019] 127.0.0.1:47626 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:45:51 2019] 127.0.0.1:47632 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                              # FederationContext::assureUserExists()
[Tue Mar 12 23:45:51 2019] 127.0.0.1:55998 [200]: /ocm-provider/
[Tue Mar 12 23:45:51 2019] 127.0.0.1:56000 [201]: /index.php/ocm/shares
[Tue Mar 12 23:45:51 2019] 127.0.0.1:47636 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE"         # FederationContext::federateSharing()
[Tue Mar 12 23:45:51 2019] 127.0.0.1:56002 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Tue Mar 12 23:45:51 2019] 127.0.0.1:47650 [200]: //ocm-provider/
[Tue Mar 12 23:45:51 2019] 127.0.0.1:47652 [201]: /index.php/ocm/notifications
[Tue Mar 12 23:45:51 2019] 127.0.0.1:47654 [200]: //ocs-provider/
[Tue Mar 12 23:45:51 2019] 127.0.0.1:47656 [200]: /ocs/v2.php/cloud/shares/10/accept?format=json
[Tue Mar 12 23:45:51 2019] 127.0.0.1:56008 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/11
    And User "user1" from server "REMOTE" accepts last pending share                                     # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                            # FederationContext::usingServer()
    And As an "user1"                                                                                    # FederationContext::asAn()
    And User "user1" modifies text of "/textfile0.txt" with text "BLABLABLA"                             # FederationContext::modifyTextOfFile()
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47666 [200]: //ocs-provider/
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47670 [401]: /public.php/webdav/textfile0.txt
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47672 [404]: /public.php/webdav/textfile0.txt
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47674 [200]: //status.php
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47676 [200]: //status.php
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47678 [200]: /index.php/apps/files_sharing/shareinfo?t=Mi5eERHUVVp2LAJ
[Tue Mar 12 23:45:52 2019] Undefined index: size at /drone/src/github.com/nextcloud/server/lib/private/Files/View.php#1324
[Tue Mar 12 23:45:52 2019] Undefined index: storage_mtime at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#126
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47680 [207]: /public.php/webdav/
[Tue Mar 12 23:45:52 2019] Undefined index: etag at /drone/src/github.com/nextcloud/server/lib/private/Files/Storage/DAV.php#784
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47682 [200]: //status.php
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47686 [200]: //status.php
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47688 [200]: /index.php/apps/files_sharing/shareinfo?t=Mi5eERHUVVp2LAJ
[Tue Mar 12 23:45:52 2019] Undefined index: mimetype at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#108
[Tue Mar 12 23:45:52 2019] 127.0.0.1:56024 [404]: /remote.php/webdav/PARENT%20(2)/textfile0.txt
    When User "user1" uploads file "../../data/user1/files/textfile0.txt" to "/PARENT (2)/textfile0.txt" # FederationContext::userUploadsAFileTo()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    And Downloading file "/PARENT (2)/textfile0.txt" with range "bytes=0-8"                              # FederationContext::downloadFileWithRange()
    Then Downloaded content should be "BLABLABLA"                                                        # FederationContext::downloadedContentShouldBe()
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47690 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:45:52 2019] 127.0.0.1:47702 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:45:53 2019] 127.0.0.1:47714 [200]: //ocm-provider/
[Tue Mar 12 23:45:53 2019] 127.0.0.1:47718 [400]: /index.php/ocm/notifications
[Tue Mar 12 23:45:53 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 10"}

[Tue Mar 12 23:45:54 2019] 127.0.0.1:47754 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Tue Mar 12 23:45:54 2019] 127.0.0.1:47756 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Overwrite a federated shared file as recipient using old chunking                           # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:247
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
[Tue Mar 12 23:45:54 2019] 127.0.0.1:56118 [404]: /ocs/v2.php/cloud/users/user1
[Tue Mar 12 23:45:55 2019] 127.0.0.1:56120 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:55 2019] 127.0.0.1:56130 [200]: /ocs/v1.php/cloud/users/user1
[Tue Mar 12 23:45:55 2019] 127.0.0.1:56142 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
[Tue Mar 12 23:45:55 2019] 127.0.0.1:56144 [404]: /ocs/v2.php/cloud/users/user2
[Tue Mar 12 23:45:56 2019] 127.0.0.1:56148 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:56 2019] 127.0.0.1:56154 [200]: /ocs/v1.php/cloud/users/user2
[Tue Mar 12 23:45:56 2019] 127.0.0.1:56166 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
[Tue Mar 12 23:45:56 2019] 127.0.0.1:47810 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:45:56 2019] 127.0.0.1:47816 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:45:57 2019] 127.0.0.1:47834 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:45:57 2019] 127.0.0.1:47852 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
[Tue Mar 12 23:45:57 2019] 127.0.0.1:56230 [200]: /ocm-provider/
[Tue Mar 12 23:45:57 2019] 127.0.0.1:56232 [201]: /index.php/ocm/shares
[Tue Mar 12 23:45:57 2019] 127.0.0.1:47860 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
[Tue Mar 12 23:45:57 2019] 127.0.0.1:56238 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Tue Mar 12 23:45:57 2019] 127.0.0.1:47890 [200]: //ocm-provider/
[Tue Mar 12 23:45:57 2019] 127.0.0.1:47892 [201]: /index.php/ocm/notifications
[Tue Mar 12 23:45:57 2019] 127.0.0.1:47894 [200]: //ocs-provider/
[Tue Mar 12 23:45:57 2019] 127.0.0.1:47896 [200]: /ocs/v2.php/cloud/shares/11/accept?format=json
[Tue Mar 12 23:45:57 2019] 127.0.0.1:56244 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/12
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47914 [200]: //ocs-provider/
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47916 [401]: /public.php/webdav/
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47918 [207]: /public.php/webdav/
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47924 [200]: //status.php
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47926 [200]: //status.php
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47928 [200]: /index.php/apps/files_sharing/shareinfo?t=h2dufjoXhBlyVsF
[Tue Mar 12 23:45:58 2019] 127.0.0.1:56260 [404]: /remote.php/webdav/textfile0%20(2).txt-chunking-42-3-0
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/textfile0%20(2).txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    And user "user1" uploads chunk file "2" of "3" with "BBBBB" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    And user "user1" uploads chunk file "3" of "3" with "CCCCC" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    When Downloading file "/textfile0 (2).txt" with range "bytes=0-4"                                   # FederationContext::downloadFileWithRange()
    Then Downloaded content should be "AAAAA"                                                           # FederationContext::downloadedContentShouldBe()
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47930 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:45:58 2019] 127.0.0.1:47964 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:45:59 2019] 127.0.0.1:48018 [200]: //ocm-provider/
[Tue Mar 12 23:45:59 2019] 127.0.0.1:48020 [400]: /index.php/ocm/notifications
[Tue Mar 12 23:45:59 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 11"}

[Tue Mar 12 23:46:01 2019] 127.0.0.1:48124 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Tue Mar 12 23:46:02 2019] 127.0.0.1:48200 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Overwrite a federated shared folder as recipient using old chunking                  # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:263
    Given Using server "REMOTE"                                                                  # FederationContext::usingServer()
[Tue Mar 12 23:46:02 2019] 127.0.0.1:56580 [404]: /ocs/v2.php/cloud/users/user1
[Tue Mar 12 23:46:02 2019] 127.0.0.1:56592 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:46:03 2019] 127.0.0.1:56612 [200]: /ocs/v1.php/cloud/users/user1
[Tue Mar 12 23:46:07 2019] 127.0.0.1:56630 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                      # FederationContext::assureUserExists()
[Tue Mar 12 23:46:07 2019] 127.0.0.1:56676 [404]: /ocs/v2.php/cloud/users/user2
[Tue Mar 12 23:46:07 2019] 127.0.0.1:56686 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:46:08 2019] 127.0.0.1:56698 [200]: /ocs/v1.php/cloud/users/user2
[Tue Mar 12 23:46:08 2019] 127.0.0.1:56720 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                      # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                     # FederationContext::usingServer()
[Tue Mar 12 23:46:08 2019] 127.0.0.1:48366 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:46:08 2019] 127.0.0.1:48370 [200]: /ocs/v1.php/cloud/users
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48380 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48388 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                      # FederationContext::assureUserExists()
[Tue Mar 12 23:46:09 2019] 127.0.0.1:56760 [200]: /ocm-provider/
[Tue Mar 12 23:46:09 2019] 127.0.0.1:56762 [201]: /index.php/ocm/shares
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48394 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
[Tue Mar 12 23:46:09 2019] 127.0.0.1:56764 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48418 [200]: //ocm-provider/
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48420 [201]: /index.php/ocm/notifications
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48424 [200]: //ocs-provider/
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48426 [200]: /ocs/v2.php/cloud/shares/12/accept?format=json
[Tue Mar 12 23:46:09 2019] 127.0.0.1:56770 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/13
    And User "user1" from server "REMOTE" accepts last pending share                             # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                    # FederationContext::usingServer()
    And As an "user1"                                                                            # FederationContext::asAn()
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48432 [200]: //ocs-provider/
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48436 [200]: //status.php
[Tue Mar 12 23:46:09 2019] 127.0.0.1:48438 [200]: //status.php
[Tue Mar 12 23:46:10 2019] 127.0.0.1:48440 [200]: /index.php/apps/files_sharing/shareinfo?t=e8xRSvc3u0hHZG9
[Tue Mar 12 23:46:10 2019] Undefined index: size at /drone/src/github.com/nextcloud/server/lib/private/Files/View.php#1324
[Tue Mar 12 23:46:10 2019] Undefined index: storage_mtime at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#126
[Tue Mar 12 23:46:10 2019] 127.0.0.1:48442 [401]: /public.php/webdav/
[Tue Mar 12 23:46:10 2019] 127.0.0.1:48444 [207]: /public.php/webdav/
[Tue Mar 12 23:46:10 2019] Undefined index: etag at /drone/src/github.com/nextcloud/server/lib/private/Files/Storage/DAV.php#784
[Tue Mar 12 23:46:10 2019] 127.0.0.1:48458 [200]: //status.php
[Tue Mar 12 23:46:10 2019] 127.0.0.1:48460 [200]: //status.php
[Tue Mar 12 23:46:10 2019] 127.0.0.1:48462 [200]: /index.php/apps/files_sharing/shareinfo?t=e8xRSvc3u0hHZG9
[Tue Mar 12 23:46:10 2019] Undefined index: mimetype at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#108
[Tue Mar 12 23:46:10 2019] 127.0.0.1:56788 [404]: /remote.php/webdav/PARENT%20(2)/textfile0.txt-chunking-42-3-0
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    And user "user1" uploads chunk file "2" of "3" with "BBBBB" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    And user "user1" uploads chunk file "3" of "3" with "CCCCC" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    When Downloading file "/PARENT (2)/textfile0.txt" with range "bytes=3-13"                    # FederationContext::downloadFileWithRange()
    Then Downloaded content should be "AABBBBBCCCC"                                              # FederationContext::downloadedContentShouldBe()
[Tue Mar 12 23:46:11 2019] 127.0.0.1:48468 [200]: /ocs/v1.php/cloud/users/user0
[Tue Mar 12 23:46:11 2019] 127.0.0.1:48496 [404]: /ocs/v2.php/cloud/users/user0
[Tue Mar 12 23:46:14 2019] 127.0.0.1:48574 [200]: //ocm-provider/
[Tue Mar 12 23:46:14 2019] 127.0.0.1:48576 [400]: /index.php/ocm/notifications
[Tue Mar 12 23:46:14 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 12"}

TESTS=acceptance, TESTS-ACCEPTANCE=app-comments

  • tests/acceptance/features/app-comments.feature:10
Show full log 
  Scenario: open the comments for a different file           # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-comments.feature:10
    Given I am logged in                                     # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "Folder"                 # FileListContext::iCreateANewFolderNamed()
    And I open the details view for "welcome.txt"            # FileListContext::iOpenTheDetailsViewFor()
    And I open the "Comments" tab in the details view        # FilesAppContext::iOpenTheTabInTheDetailsView()
    And I create a new comment with "Hello world" as message # CommentsAppContext::iCreateANewCommentWithAsMessage()
    And I see a comment with "Hello world" as message        # CommentsAppContext::iSeeACommentWithAsMessage()
      Comment with text "Hello world" in details view in Files app could not be found after 100 seconds (NoSuchElementException)
    When I open the details view for "Folder"                # FileListContext::iOpenTheDetailsViewFor()

TESTS=acceptance, TESTS-ACCEPTANCE=app-files

  • cancelled - typically means that the tests took longer than the drone CI allows them to run

TESTS=ui-regression

@ArtificialOwl ArtificialOwl mentioned this pull request Mar 13, 2019
Merged
@ArtificialOwl
Copy link
Member Author

ArtificialOwl commented Mar 13, 2019

@MorrisJobke Tested with nextcloud/calendar#602, you have my review (but I cannot approve as I am the author)

@MorrisJobke
Improve code
de8e026 
Signed-off-by: Morris Jobke <[email protected]>
MorrisJobke
MorrisJobke approved these changes Mar 13, 2019
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code makes sense 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 13, 2019
@MorrisJobke
Copy link
Member

MorrisJobke commented Mar 13, 2019

@rullzer Mind to review?

@MorrisJobke MorrisJobke merged commit 6331f17 into master Mar 14, 2019
@MorrisJobke MorrisJobke deleted the add_circle_to_caldav_and_filepanel-15 branch March 14, 2019 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@danxuliu danxuliu danxuliu left review comments

@rullzer rullzer rullzer approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@schiessle schiessle Awaiting requested review from schiessle

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish enhancement high

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

6 participants

@ArtificialOwl @MorrisJobke @rullzer @danxuliu @viniciuscb