Skip to content
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.

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

use node API for free space calculation in versions app #14470

Merged
merged 2 commits into from
Mar 5, 2019
Merged

use node API for free space calculation in versions app #14470

merged 2 commits into from
Mar 5, 2019

Conversation

felixn
Copy link

@felixn felixn commented Mar 2, 2019

the node API was extended to allow getting the raw size without mounts: #14412
this method is now used by the trashbin app to calculate free space: #14454
this pull request updates the versions app to use the same method as the trashbin app

…as trashbin app)

Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
@felixn felixn changed the title use node API for free space calculation in versions app [WIP] use node API for free space calculation in versions app Mar 2, 2019
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
@felixn felixn changed the title [WIP] use node API for free space calculation in versions app use node API for free space calculation in versions app Mar 2, 2019
@skjnldsv skjnldsv added enhancement 3. to review Waiting for reviews labels Mar 4, 2019
@skjnldsv skjnldsv requested a review from nickvergessen March 4, 2019 08:20
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

Makes sense

@MorrisJobke
Copy link
Member

Status of 16649: failure

  • DB=mysql, 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

  • DB=mysqlmb4, 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=acceptance, TESTS-ACCEPTANCE=app-files
    • tests/acceptance/features/app-files.feature:133
Show full log
  Scenario: show deleted files for a second time                      # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:133
    Given I am logged in                                              # LoginPageContext::iAmLoggedIn()
    And I open the "Deleted files" section                            # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "Deleted files"             # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I open the "All files" section                                # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "All files"                 # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I delete "welcome.txt"                                        # FileListContext::iDelete()
    When I open the "Deleted files" section                           # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Deleted files"            # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "welcome.txt" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
  • TESTS=acceptance, TESTS-ACCEPTANCE=app-files-sharing-link
    • tests/acceptance/features/app-files-sharing-link.feature:60
Show full log
  Scenario: create folder in a public editable shared folder        # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-sharing-link.feature:60
    Given I act as John                                             # ActorContext::iActAs()
    And I am logged in                                              # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "Editable shared folder"        # FileListContext::iCreateANewFolderNamed()
    And I close the details view                                    # FilesAppContext::iCloseTheDetailsView()
    And I see that the details view is closed                       # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
    And I share the link for "Editable shared folder"               # FilesAppSharingContext::iShareTheLinkFor()
      Share action for file Editable shared folder in file list could not be found after 100 seconds (NoSuchElementException)
    And I set the shared link as editable                           # FilesAppSharingContext::iSetTheSharedLinkAsEditable()
    And I write down the shared link                                # FilesAppSharingContext::iWriteDownTheSharedLink()
    When I act as Jane                                              # ActorContext::iActAs()
    And I visit the shared link I wrote down                        # PublicShareContext::iVisitTheSharedLinkIWroteDown()
    And I see that the current page is the shared link I wrote down # PublicShareContext::iSeeThatTheCurrentPageIsTheSharedLinkIWroteDown()
    And I create a new folder named "Subfolder"                     # FileListContext::iCreateANewFolderNamed()
    Then I see that the file list contains a file named "Subfolder" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
  • TESTS=acceptance, TESTS-ACCEPTANCE=header
    • tests/acceptance/features/header.feature:30
    • tests/acceptance/features/header.feature:43
Show full log
  Scenario: just added users are seen in the contacts menu               # /drone/src/github.com/nextcloud/server/tests/acceptance/features/header.feature:30
    Given I am logged in as the admin                                    # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                         # SettingsMenuContext::iOpenTheUserSettings()
    And I click the New user button                                      # UsersSettingsContext::iClickTheNewUserButton()
      New user button in Users Settings could not be found (NoSuchElementException)
    And I see that the new user form is shown                            # UsersSettingsContext::iSeeThatTheNewUserFormIsShown()
    And I create user user1 with password 123456acb                      # UsersSettingsContext::iCreateUserWithPassword()
    And I see that the list of users contains the user user1             # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    When I open the Contacts menu                                        # ContactsMenuContext::iOpenTheContactsMenu()
    Then I see that the Contacts menu is shown                           # ContactsMenuContext::iSeeThatTheContactsMenuIsShown()
    And I see that the contact "user0" in the Contacts menu is shown     # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsShown()
    And I see that the contact "user1" in the Contacts menu is shown     # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsShown()
    And I see that the contact "admin" in the Contacts menu is not shown # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsNotShown()
sh: 1: kill: No such process
  Scenario: search for other users in the contacts menu                              # /drone/src/github.com/nextcloud/server/tests/acceptance/features/header.feature:43
    Given I am logged in as the admin                                                # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                                     # SettingsMenuContext::iOpenTheUserSettings()
    And I click the New user button                                                  # UsersSettingsContext::iClickTheNewUserButton()
      New user button in Users Settings could not be found (NoSuchElementException)
    And I see that the new user form is shown                                        # UsersSettingsContext::iSeeThatTheNewUserFormIsShown()
    And I create user user1 with password 123456acb                                  # UsersSettingsContext::iCreateUserWithPassword()
    And I see that the list of users contains the user user1                         # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I open the Contacts menu                                                     # ContactsMenuContext::iOpenTheContactsMenu()
    And I see that the Contacts menu is shown                                        # ContactsMenuContext::iSeeThatTheContactsMenuIsShown()
    And I see that the contact "user0" in the Contacts menu is shown                 # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsShown()
    And I see that the contact "user1" in the Contacts menu is shown                 # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsShown()
    And I see that the Contacts menu search input is shown                           # ContactsMenuContext::iSeeThatTheContactsMenuSearchInputIsShown()
    When I search for the user "user0"                                               # ContactsMenuContext::iSearchForTheUser()
    Then I see that the contact "user1" in the Contacts menu is eventually not shown # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsEventuallyNotShown()
    And I see that the contact "user0" in the Contacts menu is shown                 # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsShown()
    And I see that the contact "admin" in the Contacts menu is not shown             # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsNotShown()
sh: 1: kill: No such process
  • TESTS=sqlite-php7.1-samba-native
Show full log
There was 1 failure:

1) OCA\Files_External\Tests\Storage\SmbTest::testNotifyGetChanges
Failed asserting that an array contains OC\Files\Notify\RenameChange Object &000000000deb67650000000004c6fd79 (
    'targetPath' => 'renamed.txt'
    'type' => 4
    'path' => 'newfile.txt'
).

/drone/src/github.com/nextcloud/server/apps/files_external/tests/Storage/SmbTest.php:115

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 and works fine here 👍

@MorrisJobke MorrisJobke added this to the Nextcloud 16 milestone Mar 5, 2019
@MorrisJobke MorrisJobke merged commit ede5f44 into nextcloud:master Mar 5, 2019
@MorrisJobke MorrisJobke mentioned this pull request Mar 6, 2019
9 tasks
rullzer added a commit that referenced this pull request Apr 2, 2019
fixes #14470

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants