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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable11] Fix legacy DAV endpoint #2685

Merged
merged 2 commits into from Dec 16, 2016

Conversation

Projects
None yet
5 participants
@LukasReschke
Member

LukasReschke commented Dec 15, 2016

This is #2684 for stable11, as the test fail this clearly proofs that something is broken 馃槩

See https://drone.nextcloud.com/nextcloud/server/3075/32 and https://drone.nextcloud.com/nextcloud/server/3075/35

cc @rullzer

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Dec 15, 2016

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

mention-bot commented Dec 15, 2016

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

@LukasReschke LukasReschke referenced this pull request Dec 15, 2016

Closed

Remove LegacyDAVACL #2653

@rullzer rullzer added this to the Nextcloud 11.0.1 milestone Dec 15, 2016

@rullzer rullzer self-assigned this Dec 15, 2016

Add test execution against legacy DAV backend
Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

@LukasReschke LukasReschke requested a review from pbek Dec 15, 2016

@LukasReschke

This comment has been minimized.

Show comment
Hide comment
@LukasReschke

LukasReschke Dec 15, 2016

Member

@rullzer Can you revert your changes to the test file? In my opinion we should 1:1 use the same test file on this branch as in stable10 and if something fails then聽鈥 well, then we should adjust the endpoint. Not the test file. This seems wrong to me.

Member

LukasReschke commented Dec 15, 2016

@rullzer Can you revert your changes to the test file? In my opinion we should 1:1 use the same test file on this branch as in stable10 and if something fails then聽鈥 well, then we should adjust the endpoint. Not the test file. This seems wrong to me.

Fix legacy caldav endpoints
* CaldavBackend is now endpoint aware (use old style principals on old
endpoint and new onces on new).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer

This comment has been minimized.

Show comment
Hide comment
@rullzer

rullzer Dec 15, 2016

Member

@pbek could you try this patch?

Member

rullzer commented Dec 15, 2016

@pbek could you try this patch?

@rullzer

This comment has been minimized.

Show comment
Hide comment
@rullzer

rullzer Dec 15, 2016

Member

@LukasReschke also you please try again. Hopefully this works...

Member

rullzer commented Dec 15, 2016

@LukasReschke also you please try again. Hopefully this works...

@pbek

This comment has been minimized.

Show comment
Hide comment
@pbek

pbek Dec 16, 2016

Member

@rullzer the last test brought my NC version up to 12.0.0.10, after checking out stable11-2648 I get an error message Downgrading is not supported and is likely to cause unpredictable issues (from 12.0.0.10 to 11.0.0.10), is there a way to get around that?

Member

pbek commented Dec 16, 2016

@rullzer the last test brought my NC version up to 12.0.0.10, after checking out stable11-2648 I get an error message Downgrading is not supported and is likely to cause unpredictable issues (from 12.0.0.10 to 11.0.0.10), is there a way to get around that?

@rullzer

This comment has been minimized.

Show comment
Hide comment
@rullzer

rullzer Dec 16, 2016

Member

@pbek uhm. If it is a live instance better not. If this works for @LukasReschke I'll create a master PR you should then be able to test.

Member

rullzer commented Dec 16, 2016

@pbek uhm. If it is a live instance better not. If this works for @LukasReschke I'll create a master PR you should then be able to test.

@pbek

This comment has been minimized.

Show comment
Hide comment
@pbek

pbek Dec 16, 2016

Member

@rullzer, no, I just created that instance for testing the CalDAV PRs.

Member

pbek commented Dec 16, 2016

@rullzer, no, I just created that instance for testing the CalDAV PRs.

@rullzer

This comment has been minimized.

Show comment
Hide comment
@rullzer

rullzer Dec 16, 2016

Member

ah uhm. Well either install again. Or edit the version in config/config.php

Member

rullzer commented Dec 16, 2016

ah uhm. Well either install again. Or edit the version in config/config.php

@pbek

This comment has been minimized.

Show comment
Hide comment
@pbek

pbek Dec 16, 2016

Member

I went for the latter.
Now I'm happy to confirm that the PUT request went through (with an empty return body) and the ICS was modified on the server. QOwnNotes also works again with that branch!
Great job, @rullzer!

Member

pbek commented Dec 16, 2016

I went for the latter.
Now I'm happy to confirm that the PUT request went through (with an empty return body) and the ICS was modified on the server. QOwnNotes also works again with that branch!
Great job, @rullzer!

@mariokorte

This comment has been minimized.

Show comment
Hide comment
@mariokorte

mariokorte Dec 16, 2016

@rullzer I too can confirm your fix works! Thanks a million!

mariokorte commented Dec 16, 2016

@rullzer I too can confirm your fix works! Thanks a million!

@rullzer

This comment has been minimized.

Show comment
Hide comment
@rullzer

rullzer Dec 16, 2016

Member

Phew. Ok let me wait for a review of @LukasReschke and then this can hopefully soon go in :D

Member

rullzer commented Dec 16, 2016

Phew. Ok let me wait for a review of @LukasReschke and then this can hopefully soon go in :D

@rullzer rullzer changed the title from [PROOF_THAT_IT_IS_BROKEN]聽Add test execution against legacy DAV backend to [stable11] Fix legacy DAV backend Dec 16, 2016

@rullzer rullzer changed the title from [stable11] Fix legacy DAV backend to [stable11] Fix legacy DAV endpoint Dec 16, 2016

@rullzer rullzer referenced this pull request Dec 16, 2016

Merged

Fix legacy DAV endpoint #2712

@rullzer rullzer added 3. to review and removed 2. developing labels Dec 16, 2016

@rullzer

This comment has been minimized.

Show comment
Hide comment
@rullzer

rullzer Dec 16, 2016

Member

Failing tests are unrelated (jsunit + timeout)

Member

rullzer commented Dec 16, 2016

Failing tests are unrelated (jsunit + timeout)

@LukasReschke

This comment has been minimized.

Show comment
Hide comment
@LukasReschke
Member

LukasReschke commented Dec 16, 2016

LGTM

@LukasReschke LukasReschke merged commit 3f20302 into stable11 Dec 16, 2016

0 of 2 checks passed

continuous-integration/drone/pr the build failed
Details
continuous-integration/drone/push the build failed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment