Retry upload overwrite if file locked in UI tests #30513

phil-davis · 2018-02-18T02:58:34Z

Description

For file upload tests that overwrite an existing file, retry the upload process if it gets some notification (probably about "file locked"). Report that a notification was received, and the text of the notification, so that it is possible to see in the test output that "something happened" but try again anyway up to the "standard" number of retries.

The retry actions go through the same sequence of UI actions that the user would do anyway, when they see a "file locked" message after trying to do an upload.

Related Issue

#30506

Motivation and Context

Make upload-overwrite UI tests reliable.

How Has This Been Tested?

CI passes

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

codecov · 2018-02-18T03:35:28Z

Codecov Report

Merging #30513 into master will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #30513   +/-   ##
=========================================
  Coverage     61.59%   61.59%           
  Complexity    18505    18505           
=========================================
  Files          1090     1090           
  Lines         61104    61104           
=========================================
  Hits          37640    37640           
  Misses        23464    23464

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 88e3fa0...53a6858. Read the comment docs.

phil-davis · 2018-02-18T03:54:34Z

It can retry the UI upload if it gets a file-locked notification, and the upload works the 2nd time - good.

  Scenario: overwrite an existing file in a sub-folder                            # /drone/src/tests/ui/features/upload/upload.feature:70
    When I open the folder "simple-folder"                                        # FilesContext::iOpenTheFolderNamed()
Upload overwriting lorem.txt and got 1 notifications including "simple-folder/lorem.txt" is locked
INFORMATION: retried to upload overwriting file lorem.txt 1 times
    And I upload overwriting the file "lorem.txt" and retry if the file is locked # FilesContext::iUploadOverwritingTheFileRetry()
      │ INFORMATION: retried to upload overwriting file lorem.txt 1 times
    Then the file "lorem.txt" should be listed                                    # FilesContext::theFileFolderShouldBeListed()
    And the content of "lorem.txt" should be the same as the local "lorem.txt"    # FilesContext::theContentOfShouldBeTheSameAsTheLocal()

individual-it · 2018-02-18T08:57:28Z

tests/ui/features/bootstrap/FeatureContext.php

+	public function noNotificationShouldBeDisplayed() {
+		try {
+			$notificationText = $this->owncloudPage->getNotificationText();
+			PHPUnit_Framework_Assert::assertEquals('', $notificationText, "Expecting no notifications but got $notificationText");


pretty long line

I will run phpcs ...

individual-it · 2018-02-18T08:57:46Z

tests/ui/features/bootstrap/FeatureContext.php

+		try {
+			$notificationText = $this->owncloudPage->getNotificationText();
+			PHPUnit_Framework_Assert::assertEquals('', $notificationText, "Expecting no notifications but got $notificationText");
+		} catch (\SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException $e) {


can we put it in a use statement?

individual-it · 2018-02-18T08:59:18Z

tests/ui/features/bootstrap/FilesContext.php

@@ -91,13 +92,15 @@ class FilesContext extends RawMinkContext implements Context {
 	 * @return void
 	 */
 	public function __construct(
+		OwncloudPage $owncloudPage,


why do we need that? Every page extends OwncloudPage

this is not a Page but a Context class.

class FilesPage extends FilesPageBasic {

core/tests/ui/features/lib/FilesPage.php

Line 35 in eca03d9

class FilesPage extends FilesPageBasic {

abstract class FilesPageBasic extends OwnCloudPage {

core/tests/ui/features/lib/FilesPageBasic.php

Line 35 in eca03d9

abstract class FilesPageBasic extends OwnCloudPage {

so in https://github.com/owncloud/core/pull/30513/files#diff-728c995ac1e138bb2d77c3a588cb018dR481 you should be able to use $notifications = $this->filesPage->getNotifications();

now I see :) what you mean

changes made - please review again

phil-davis · 2018-02-19T12:55:55Z

Backport stable10 #30528

lock · 2019-08-01T02:02:11Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

phil-davis self-assigned this Feb 18, 2018

phil-davis force-pushed the retry-upload-if-file-locked-01 branch 2 times, most recently from 1e98a18 to b5dc81f Compare February 18, 2018 04:43

phil-davis changed the title ~~[WIP] Retry upload if file locked 01~~ Retry upload overwrite if file locked in UI tests Feb 18, 2018

This was referenced Feb 18, 2018

[WIP] Try to see any file locked notification #30512

Closed

[test] Retry upload test runs 01 #30514

Closed

phil-davis added 3 - To Review dev:acceptance-tests labels Feb 18, 2018

phil-davis added this to the development milestone Feb 18, 2018

phil-davis requested review from individual-it and patrickjahns February 18, 2018 06:56

phil-davis mentioned this pull request Feb 18, 2018

Preview seems to not properly unlock files #30506

Closed

individual-it previously requested changes Feb 18, 2018

View reviewed changes

phil-davis force-pushed the retry-upload-if-file-locked-01 branch 2 times, most recently from eca03d9 to 4fe775e Compare February 19, 2018 02:29

phil-davis mentioned this pull request Feb 19, 2018

[test] Retry upload test runs 02 #30522

Closed

individual-it approved these changes Feb 19, 2018

View reviewed changes

Retry when doing upload overwrite in UI tests

53a6858

phil-davis force-pushed the retry-upload-if-file-locked-01 branch from 4fe775e to 53a6858 Compare February 19, 2018 08:46

phil-davis added the backport-request label Feb 19, 2018

phil-davis mentioned this pull request Feb 19, 2018

Free resources in preview providers #30507

Merged

9 tasks

phil-davis merged commit 0a0d750 into master Feb 19, 2018

phil-davis deleted the retry-upload-if-file-locked-01 branch February 19, 2018 09:59

phil-davis mentioned this pull request Feb 19, 2018

[stable10] Retry when doing upload overwrite in UI tests #30528

Merged

phil-davis removed the backport-request label Feb 19, 2018

lock bot locked as resolved and limited conversation to collaborators Aug 1, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Retry upload overwrite if file locked in UI tests #30513

Retry upload overwrite if file locked in UI tests #30513

phil-davis commented Feb 18, 2018 •

edited

Loading

codecov bot commented Feb 18, 2018 •

edited

Loading

phil-davis commented Feb 18, 2018

individual-it Feb 18, 2018

phil-davis Feb 18, 2018

individual-it Feb 18, 2018

phil-davis Feb 18, 2018

individual-it Feb 18, 2018

phil-davis Feb 18, 2018

individual-it Feb 18, 2018

phil-davis Feb 18, 2018 •

edited

Loading

phil-davis commented Feb 19, 2018

lock bot commented Aug 1, 2019

Retry upload overwrite if file locked in UI tests #30513

Retry upload overwrite if file locked in UI tests #30513

Conversation

phil-davis commented Feb 18, 2018 • edited Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

codecov bot commented Feb 18, 2018 • edited Loading

Codecov Report

phil-davis commented Feb 18, 2018

individual-it Feb 18, 2018

Choose a reason for hiding this comment

phil-davis Feb 18, 2018

Choose a reason for hiding this comment

individual-it Feb 18, 2018

Choose a reason for hiding this comment

phil-davis Feb 18, 2018

Choose a reason for hiding this comment

individual-it Feb 18, 2018

Choose a reason for hiding this comment

phil-davis Feb 18, 2018

Choose a reason for hiding this comment

individual-it Feb 18, 2018

Choose a reason for hiding this comment

phil-davis Feb 18, 2018 • edited Loading

Choose a reason for hiding this comment

phil-davis commented Feb 19, 2018

lock bot commented Aug 1, 2019

phil-davis commented Feb 18, 2018 •

edited

Loading

codecov bot commented Feb 18, 2018 •

edited

Loading

phil-davis Feb 18, 2018 •

edited

Loading