Skip to content

[stable9.1] Properly convert OCS params + more tests#26694

Closed
PVince81 wants to merge 3 commits into
stable9.1from
stable9.1-1309dfdcc88ee92bb4deb4d1e87a7120956e24c6
Closed

[stable9.1] Properly convert OCS params + more tests#26694
PVince81 wants to merge 3 commits into
stable9.1from
stable9.1-1309dfdcc88ee92bb4deb4d1e87a7120956e24c6

Conversation

@PVince81

Copy link
Copy Markdown
Contributor

Backport of #26691 to stable9.1

Retested manually, still works. (it's covered by int tests though)

@jvillafanez @DeepDiver1975 @SergioBertolinSG

@PVince81 PVince81 added this to the 9.1.3 milestone Nov 23, 2016
@mention-bot

Copy link
Copy Markdown

@PVince81, thanks for your PR! By analyzing the history of the files in this pull request, we identified @SergioBertolinSG, @rullzer and @MorrisJobke to be potential reviewers.

@PVince81
PVince81 force-pushed the stable9.1-1309dfdcc88ee92bb4deb4d1e87a7120956e24c6 branch from 37eb228 to ad00640 Compare November 23, 2016 09:12
@jvillafanez

Copy link
Copy Markdown
Member

👍

@PVince81

Copy link
Copy Markdown
Contributor Author

Oh no, more test backports needed, @SergioBertolinSG can you help identify which ?

11:49:51     /**
11:49:51      * @Then the response contains :arg1 entries
11:49:51      */
11:49:51     public function theResponseContainsEntries($arg1)
11:49:51     {
11:49:51         throw new PendingException();
11:49:51     }
11:49:51 
11:49:51     /**
11:49:51      * @Then File :arg1 should be included as path in the response
11:49:51      */
11:49:51     public function fileShouldBeIncludedAsPathInTheResponse($arg1)
11:49:51     {
11:49:51         throw new PendingException();
11:49:51     }
11:49:51 
11:49:51     /**
11:49:51      * @Then File :arg1 should not be included as path in the response
11:49:51      */
11:49:51     public function fileShouldNotBeIncludedAsPathInTheResponse($arg1)
11:49:51     {
11:49:51         throw new PendingException();
11:49:51     }
11:49:51 
11:49:51     /**
11:49:51      * @Given user :arg1 stores etag of element :arg2
11:49:51      */
11:49:51     public function userStoresEtagOfElement($arg1, $arg2)
11:49:51     {
11:49:51         throw new PendingException();
11:49:51     }
11:49:51 
11:49:51     /**
11:49:51      * @Then etag of element :arg1 of user :arg2 has changed
11:49:51      */
11:49:51     public function etagOfElementOfUserHasChanged($arg1, $arg2)
11:49:51     {
11:49:51         throw new PendingException();
11:49:51     }
11:49:51 
11:49:51     /**
11:49:51      * @Then etag of element :arg1 of user :arg2 has not changed
11:49:51      */
11:49:51     public function etagOfElementOfUserHasNotChanged($arg1, $arg2)
11:49:51     {
11:49:51         throw new PendingException();
11:49:51     }

@PVince81

PVince81 commented Nov 24, 2016

Copy link
Copy Markdown
Contributor Author

@PVince81
PVince81 force-pushed the stable9.1-1309dfdcc88ee92bb4deb4d1e87a7120956e24c6 branch from ad00640 to dc26438 Compare November 24, 2016 10:54
@PVince81

Copy link
Copy Markdown
Contributor Author

Rebased. Tests should hopefully pass now.

@PVince81

Copy link
Copy Markdown
Contributor Author

Uh oh, rebase failure:

13:23:06   Expected Step, but got text: ">>>>>>> Added tests about permissions and public upload" in file: /var/lib/jenkins/workspace/owncloud-core_core_PR-26694-BLDVCEXDEUWCA5MWIA4BU4ICR5DGPZTFWHZXZQC634NNBIIGGNBQ/build/integration/features/sharing-v1.feature 

Will fix...

@PVince81
PVince81 force-pushed the stable9.1-1309dfdcc88ee92bb4deb4d1e87a7120956e24c6 branch from dc26438 to 00ce622 Compare November 24, 2016 14:10
@PVince81

Copy link
Copy Markdown
Contributor Author

And now the other random failures appear again:

15:37:36 1) OCA\Files\Tests\Command\DeleteOrphanedFilesTest::testClearFiles
15:37:36 Expectation failed for method name is equal to <string:writeln> when invoked 1 time(s)
15:37:36 Parameter 0 for invocation Symfony\Component\Console\Output\OutputInterface::writeln('14 orphaned file cache entries deleted', 0) does not match expected value.
15:37:36 Failed asserting that two strings are equal.
15:37:36 --- Expected
15:37:36 +++ Actual
15:37:36 @@ @@
15:37:36 -'4 orphaned file cache entries deleted'
15:37:36 +'14 orphaned file cache entries deleted'
15:37:36 
15:37:36 /var/lib/jenkins/workspace/owncloud-core_core_PR-26694-BLDVCEXDEUWCA5MWIA4BU4ICR5DGPZTFWHZXZQC634NNBIIGGNBQ/apps/files/lib/Command/DeleteOrphanedFiles.php:81
15:37:36 /var/lib/jenkins/workspace/owncloud-core_core_PR-26694-BLDVCEXDEUWCA5MWIA4BU4ICR5DGPZTFWHZXZQC634NNBIIGGNBQ/apps/files/tests/Command/DeleteOrphanedFilesTest.php:119
15:37:36 
15:37:36 2) OCA\Files_Sharing\Tests\CacheTest::testGetFolderContentsInRoot
15:37:36 Failed asserting that 10 matches expected 3.
15:37:36 
15:37:36 /var/lib/jenkins/workspace/owncloud-core_core_PR-26694-BLDVCEXDEUWCA5MWIA4BU4ICR5DGPZTFWHZXZQC634NNBIIGGNBQ/apps/files_sharing/tests/CacheTest.php:444
15:37:36 /var/lib/jenkins/workspace/owncloud-core_core_PR-26694-BLDVCEXDEUWCA5MWIA4BU4ICR5DGPZTFWHZXZQC634NNBIIGGNBQ/apps/files_sharing/tests/CacheTest.php:349
15:37:36 

Probably the env is in a broken state now...

I'll make a new PR for CI...

Vincent Petry and others added 2 commits November 24, 2016 15:55
Added read and share permissions instead of all (default ones)

Added positive case

Check also permissions update

Added tests for resharing with public links when the user doesn't have enough permisssions
@PVince81

Copy link
Copy Markdown
Contributor Author

#26715

@PVince81

Copy link
Copy Markdown
Contributor Author

@SergioBertolinSG seems there is more missing:

17:47:03 --- FeatureContext has missing steps. Define them with these snippets:
17:47:03 
17:47:03     /**
17:47:03      * @Then the response contains :arg1 entries
17:47:03      */
17:47:03     public function theResponseContainsEntries($arg1)
17:47:03     {
17:47:03         throw new PendingException();
17:47:03     }
17:47:03 
17:47:03     /**
17:47:03      * @Then File :arg1 should be included as path in the response
17:47:03      */
17:47:03     public function fileShouldBeIncludedAsPathInTheResponse($arg1)
17:47:03     {
17:47:03         throw new PendingException();
17:47:03     }
17:47:03 
17:47:03     /**
17:47:03      * @Then File :arg1 should not be included as path in the response
17:47:03      */
17:47:03     public function fileShouldNotBeIncludedAsPathInTheResponse($arg1)
17:47:03     {
17:47:03         throw new PendingException();
17:47:03     }

Partial backport of the integration tests from #26610
@PVince81

Copy link
Copy Markdown
Contributor Author

Not sure if I backported wrong but it seems we backported more sharing tests than necessary. It's not a bad thing. I'll add the missing functions and be done with it. More testing more good!!!

@PVince81
PVince81 force-pushed the stable9.1-1309dfdcc88ee92bb4deb4d1e87a7120956e24c6 branch from 00ce622 to c5c627d Compare November 24, 2016 17:20
@PVince81

Copy link
Copy Markdown
Contributor Author

This env is bust.

Rebooted PR on a new branch: #26716

@PVince81 PVince81 closed this Nov 24, 2016
@PVince81
PVince81 deleted the stable9.1-1309dfdcc88ee92bb4deb4d1e87a7120956e24c6 branch November 24, 2016 17:37
@lock

lock Bot commented Aug 4, 2019

Copy link
Copy Markdown

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.

@lock lock Bot locked as resolved and limited conversation to collaborators Aug 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants