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

[Tests-Only] Make API tests pass on EOS #37575

Merged
merged 2 commits into from
Jul 6, 2020
Merged

Conversation

haribhandari07
Copy link
Contributor

@haribhandari07 haribhandari07 commented Jun 23, 2020

Description

Right now ocis behaves differently (partly) with EOS storage. This PR makes files permissions tests to pass on EOS

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@haribhandari07 haribhandari07 force-pushed the file-share-permissions branch 2 times, most recently from b625c9a to e29cd0a Compare June 23, 2020 08:18
@haribhandari07 haribhandari07 self-assigned this Jun 23, 2020
@codecov
Copy link

codecov bot commented Jun 23, 2020

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37575   +/-   ##
=========================================
  Coverage     64.70%   64.70%           
  Complexity    19350    19350           
=========================================
  Files          1281     1281           
  Lines         75607    75607           
  Branches       1333     1333           
=========================================
  Hits          48920    48920           
  Misses        26295    26295           
  Partials        392      392           
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.88% <ø> (ø) 19350.00 <ø> (ø)

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 a13d708...e29cd0a. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 23, 2020

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37575   +/-   ##
=========================================
  Coverage     64.74%   64.74%           
  Complexity    19360    19360           
=========================================
  Files          1281     1281           
  Lines         75622    75622           
  Branches       1333     1333           
=========================================
  Hits          48959    48959           
  Misses        26271    26271           
  Partials        392      392           
Flag Coverage Δ Complexity Δ
#javascript 54.03% <ø> (ø) 0.00 <ø> (ø)
#phpunit 65.92% <ø> (ø) 19360.00 <ø> (ø)

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 2aacc87...3e0f7ed. Read the comment docs.

@haribhandari07 haribhandari07 marked this pull request as ready for review June 23, 2020 09:38
Copy link
Contributor

@dpakach dpakach left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@individual-it
Copy link
Member

I'm taking over this PR

@individual-it individual-it force-pushed the file-share-permissions branch from 7a531aa to 0d7dd84 Compare July 2, 2020 09:51
@individual-it
Copy link
Member

rebased and fixed conflicts

@individual-it individual-it force-pushed the file-share-permissions branch from fef0b46 to 50b3dba Compare July 3, 2020 10:31
@individual-it individual-it dismissed their stale review July 6, 2020 02:59

I worked myself on this PR

@individual-it individual-it changed the title [Tests-Only] Make file share with permissions test pass on EOS [Tests-Only] Make API tests pass on EOS Jul 6, 2020
Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

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

There are also 2 occurrences of [a-f0-9:]{1,32} in apiWebdavOperations/search.feature - probably those should also be made more flexible.

Maybe we should have a substituteInLineCodes item for this string. We keep changing it a bit and have to search-replace throughout the feature files. Maybe %etag_regex% could expand to the regex?

@individual-it individual-it force-pushed the file-share-permissions branch from 50b3dba to 3e0f7ed Compare July 6, 2020 05:13
@individual-it
Copy link
Member

making it more flexible is currently an issue because when checking the substitution in the headers we also run preg_quote to be able to mix the substitution with regular expressions see f4beb74#diff-22732c7ce419762b047562109c5dff15R154
so if the substitution is a regular expression itself there are too many quotes

@individual-it individual-it requested a review from phil-davis July 6, 2020 05:17
@individual-it
Copy link
Member

some tests fail in the ocis repo because of new enabled tests in 21803fd

@individual-it individual-it merged commit 686ee50 into master Jul 6, 2020
@delete-merged-branch delete-merged-branch bot deleted the file-share-permissions branch July 6, 2020 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants