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

Have streams of files_external in sync #14579

Merged
merged 1 commit into from
Mar 7, 2019

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Mar 7, 2019

Because we ship streams 2 times they have to stay in sync (yay for PHP dependency hell!).

Else uploading 0 byte files fails hard with S3 because the wrong lib is used.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer added bug 3. to review Waiting for reviews labels Mar 7, 2019
@rullzer rullzer added this to the Nextcloud 16 milestone Mar 7, 2019
@rullzer
Copy link
Member Author

rullzer commented Mar 7, 2019

/backport to stable15

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

🎆

@faily-bot
Copy link

faily-bot bot commented Mar 7, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16844: 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=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=login

  • tests/acceptance/features/login.feature:9
  • tests/acceptance/features/login.feature:15
  • tests/acceptance/features/login.feature:26
  • tests/acceptance/features/login.feature:38
Show full log
  Scenario: try to log in with valid user and invalid password # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:9
    Given I visit the Home page                                # FeatureContext::iVisitTheHomePage()
    When I log in with user user0 and password 654321          # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Login page         # LoginPageContext::iSeeThatTheCurrentPageIsTheLoginPage()
    And I see that a wrong password message is shown           # LoginPageContext::iSeeThatAWrongPasswordMessageIsShown()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)

  Scenario: log in with valid user and invalid password once fixed by admin # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:15
    Given I act as John                                                     # ActorContext::iActAs()
    And I can not log in with user user0 and password 654231                # LoginPageContext::iCanNotLogInWithUserAndPassword()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)
    When I act as Jane                                                      # ActorContext::iActAs()
    And I am logged in as the admin                                         # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                            # SettingsMenuContext::iOpenTheUserSettings()
    And I set the password for user0 to 654321                              # UsersSettingsContext::iSetTheFieldForUserTo()
    And I act as John                                                       # ActorContext::iActAs()
    And I log in with user user0 and password 654321                        # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Files app                       # FilesAppContext::iSeeThatTheCurrentPageIsTheFilesApp()

  Scenario: try to log in with invalid user                    # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:26
    Given I visit the Home page                                # FeatureContext::iVisitTheHomePage()
    When I log in with user unknownUser and password 123456acb # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Login page         # LoginPageContext::iSeeThatTheCurrentPageIsTheLoginPage()
    And I see that a wrong password message is shown           # LoginPageContext::iSeeThatAWrongPasswordMessageIsShown()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)

  Scenario: log in with invalid user once fixed by admin              # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:38
    Given I act as John                                               # ActorContext::iActAs()
    And I can not log in with user unknownUser and password 123456acb # LoginPageContext::iCanNotLogInWithUserAndPassword()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)
    When I act as Jane                                                # ActorContext::iActAs()
    And 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()
    And I see that the new user form is shown                         # UsersSettingsContext::iSeeThatTheNewUserFormIsShown()
    And I create user unknownUser with password 123456acb             # UsersSettingsContext::iCreateUserWithPassword()
    And I see that the list of users contains the user unknownUser    # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I act as John                                                 # ActorContext::iActAs()
    And I log in with user unknownUser and password 123456acb         # LoginPageContext::iLogInWithUserAndPassword()

Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

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

looks good

@rullzer rullzer merged commit 7ff1f83 into master Mar 7, 2019
@rullzer rullzer deleted the fix/bump_streams_files_external branch March 7, 2019 11:53
@backportbot-nextcloud
Copy link

The backport to stable15 failed. Please do this backport manually.

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 bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants