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

Add mimetype to OCS Share API output #23056

Merged
merged 2 commits into from
Mar 10, 2016
Merged

Add mimetype to OCS Share API output #23056

merged 2 commits into from
Mar 10, 2016

Conversation

rullzer
Copy link
Contributor

@rullzer rullzer commented Mar 9, 2016

Fixes #23044

Was missed during the conversion of the API and apparently no tests in place. (they are now)

@BenS89 please verify

CC: @LukasReschke @PVince81 @nickvergessen @MorrisJobke

@rullzer
Copy link
Contributor Author

rullzer commented Mar 9, 2016

@karlitschek trivial patch but fixes some UX. Backport to 9.0.1 makes sense to me.

@karlitschek
Copy link
Contributor

backport makes sense 👍

@BenS89
Copy link

BenS89 commented Mar 9, 2016

@rullzer that did the trick. Thanks for fixing the issue with this PR.

@rullzer
Copy link
Contributor Author

rullzer commented Mar 9, 2016

stable9 in #23060

@MorrisJobke
Copy link
Contributor

👍

@nickvergessen
Copy link
Contributor

Can we add that to the integration test?

@DeepDiver1975
Copy link
Member

Can we add that to the integration test?

@rullzer

@rullzer
Copy link
Contributor Author

rullzer commented Mar 10, 2016

Yes good point. let me add that.

@rullzer
Copy link
Contributor Author

rullzer commented Mar 10, 2016

Intergration tests added.

@MorrisJobke
Copy link
Contributor

Feature: federated

  Background:                   # /ssd/jenkins/workspace/ocs-api-integration-tests-ci/build/integration/federation_features/federated.feature:2
    Given using api version "1" # FederationContext::usingApiVersion()

  Scenario: Federate share a file with another server                                                    # /ssd/jenkins/workspace/ocs-api-integration-tests-ci/build/integration/federation_features/federated.feature:5
    Given Using server "REMOTE"                                                                          # FederationContext::usingServer()
[Thu Mar 10 08:34:45 2016] ::1:38866 [404]: /ocs/v2.php/cloud/users/user1
[Thu Mar 10 08:34:46 2016] ::1:38880 [200]: /ocs/v1.php/cloud/users
[Thu Mar 10 08:34:48 2016] ::1:38888 [200]: /ocs/v1.php/cloud/users/user1
[Thu Mar 10 08:34:49 2016] ::1:38900 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                              # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                             # FederationContext::usingServer()
[Thu Mar 10 08:34:49 2016] ::1:33709 [404]: /ocs/v2.php/cloud/users/user0
[Thu Mar 10 08:34:50 2016] ::1:33715 [200]: /ocs/v1.php/cloud/users
Build timed out (after 20 minutes). Marking the build as aborted.
Build was aborted
Regular expression run condition: Expression=[origin/master|origin/stable\d+(\.\d+)?], Label=[origin/fix_23044]
Run condition [Regular expression match] preventing perform for step [[E-mail Notification]]
Recording test results
    And user "user0" exists                                                                              # FederationContext::assureUserExists()
      cURL error 52: Empty reply from server (GuzzleHttp\Exception\ConnectException)
    When User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
    Then the OCS status code should be "100"                                                             # FederationContext::theOCSStatusCodeShouldBe()
    And the HTTP status code should be "200"                                                             # FederationContext::theHTTPStatusCodeShouldBe()
  │
  ╳  cURL error 56: Recv failure: Connection reset by peer (GuzzleHttp\Exception\RequestException)
  │
  └─ @AfterScenario # FederationContext::cleanupUsers()

@rullzer Simply rerun? Or is this an actual failure?

@rullzer
Copy link
Contributor Author

rullzer commented Mar 10, 2016

Build timed out (after 20 minutes). Marking the build as aborted.

@MorrisJobke it is a timeout... @DeepDiver1975 is already notified.

@DeepDiver1975
Copy link
Member

@MorrisJobke it is a timeout... @DeepDiver1975 is already notified.

incremented to 30 minutes

@rullzer
Copy link
Contributor Author

rullzer commented Mar 10, 2016

Thanks @DeepDiver1975

Rebased to retrigger CI

DeepDiver1975 added a commit that referenced this pull request Mar 10, 2016
Add mimetype to OCS Share API output
@DeepDiver1975 DeepDiver1975 merged commit 8e51634 into master Mar 10, 2016
@DeepDiver1975 DeepDiver1975 deleted the fix_23044 branch March 10, 2016 20:18
@lock
Copy link

lock bot commented Aug 7, 2019

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 7, 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.

ownCloud 9: missing document icons in filter views
6 participants