Page MenuHomeSoftware Heritage
Differential D7795

Test to detect uppercase NPM metadata file
ClosedPublic
Actions

Authored by VickyMerzOwn on May 9 2022, 4:43 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers

Diff Detail

Repository
rDCIDX Metadata indexer
Branch
test-cases
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 29345
Build 45856: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 45855: arc lint + arc unit

Event Timeline

VickyMerzOwn created this revision.May 9 2022, 4:43 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMay 9 2022, 4:43 PM
swh-public-ci added a comment.May 9 2022, 4:48 PM

Build is green

Patch application report for D7795 (id=28131)

Rebasing onto 5208aaf122...

Current branch diff-target is up to date.
Changes applied before test
commit 94fe1fedf351669d9a4fe734f9e7bd0d4cda166d
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Mon May 9 20:12:55 2022 +0530

    Reformat test to detect uppercase NPM metadata file

See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/220/ for more details.

Harbormaster completed remote builds in B29198: Diff 28131.May 9 2022, 4:48 PM
VickyMerzOwn requested review of this revision.May 9 2022, 4:48 PM
ardumont added a subscriber: ardumont.May 9 2022, 6:05 PM
ardumont added inline comments.
swh/indexer/tests/test_metadata.py
408–409

Hopefully that works with unittest like tests too...

464

For this, we now tend to use pytest.mark.parametrize decorator (as per my previous suggestion above).
All this in order to decrease the code duplication.

Can you please give it a try?

ardumont added inline comments.May 9 2022, 6:07 PM
swh/indexer/tests/test_metadata.py
464

for some example, please, check [1]

[1] https://forge.softwareheritage.org/search/query/0jpXqt8EYpXC/#R

VickyMerzOwn updated this revision to Diff 28221.May 11 2022, 5:37 PM

Test using @pytest.mark.parametrize decorator

swh-public-ci added a comment.May 11 2022, 5:42 PM

Build has FAILED

Patch application report for D7795 (id=28221)

Could not rebase; Attempt merge onto f9919fa8af...

Merge made by the 'recursive' strategy.
 swh/indexer/tests/test_metadata.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
Changes applied before test
commit 5e44c22ad02146820cd5d3947fb778236cf5aaaa
Merge: f9919fa 01f15e9
Author: Jenkins user <jenkins@localhost>
Date:   Wed May 11 15:37:43 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 01f15e9db1aa1d2061178e5395350da3135b81ce
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed May 11 21:02:36 2022 +0530

    Test using @pytest.mark.parametrize decorator

commit 94fe1fedf351669d9a4fe734f9e7bd0d4cda166d
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Mon May 9 20:12:55 2022 +0530

    Reformat test to detect uppercase NPM metadata file

Link to build: https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/221/
See console output for more information: https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/221/console

Harbormaster failed remote builds in B29328: Diff 28221!May 11 2022, 5:42 PM
VickyMerzOwn updated this revision to Diff 28223.May 11 2022, 6:23 PM

Parametrize test using subTest in unittest

swh-public-ci added a comment.May 11 2022, 6:27 PM

Build is green

Patch application report for D7795 (id=28223)

Could not rebase; Attempt merge onto f9919fa8af...

Merge made by the 'recursive' strategy.
 swh/indexer/tests/test_metadata.py | 64 ++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 30 deletions(-)
Changes applied before test
commit 45f5f3573155d2748cf4311e58342872627a11c6
Merge: f9919fa 72725d6
Author: Jenkins user <jenkins@localhost>
Date:   Wed May 11 16:23:43 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 72725d67a06ac2c28b2d4ed1114869354a399917
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed May 11 21:52:43 2022 +0530

    Reformate paraetrized test using subTest in unittest

commit 01f15e9db1aa1d2061178e5395350da3135b81ce
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed May 11 21:02:36 2022 +0530

    Test using @pytest.mark.parametrize decorator

commit 94fe1fedf351669d9a4fe734f9e7bd0d4cda166d
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Mon May 9 20:12:55 2022 +0530

    Reformat test to detect uppercase NPM metadata file

See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/222/ for more details.

Harbormaster completed remote builds in B29330: Diff 28223.May 11 2022, 6:27 PM
ardumont accepted this revision.May 11 2022, 6:36 PM

Thanks!

This revision is now accepted and ready to land.May 11 2022, 6:36 PM
VickyMerzOwn updated this revision to Diff 28224.May 11 2022, 8:04 PM
  • Add vickymerzown to CONTRIBUTORS
swh-public-ci added a comment.May 11 2022, 8:09 PM

Build is green

Patch application report for D7795 (id=28224)

Rebasing onto f9919fa8af...

First, rewinding head to replay your work on top of it...
Applying: Reformat test to detect uppercase NPM metadata file
Applying: Test using @pytest.mark.parametrize decorator
Applying: Reformate paraetrized test using subTest in unittest
Applying: Add vickymerzown to CONTRIBUTORS
Changes applied before test
commit d02c2a9a09ba0f751cb9c210c17307f672ed9257
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed May 11 22:11:29 2022 +0530

    Add vickymerzown to CONTRIBUTORS

commit b60a444d094ec7731db14122fb83e5bcddb29cd3
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed May 11 21:52:43 2022 +0530

    Reformate paraetrized test using subTest in unittest

commit 01c548290554190f90800f25144ca23b3de33ad1
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed May 11 21:02:36 2022 +0530

    Test using @pytest.mark.parametrize decorator

commit 456e209fb2bd6dd516a1778f93ef39bb8fad581d
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Mon May 9 20:12:55 2022 +0530

    Reformat test to detect uppercase NPM metadata file

See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/223/ for more details.

Harbormaster completed remote builds in B29331: Diff 28224.May 11 2022, 8:09 PM
ardumont added a comment.May 12 2022, 11:01 AM

I missed it yesterday, can you please squash your commits into 1 (including the add to contributor one, it's fine ;) ?
(And then update the diff, wait for tests to go green and push, the diff will close then).

TIA

VickyMerzOwn updated this revision to Diff 28239.May 12 2022, 2:34 PM
  • Reformat test to detect uppercase NPM metadata file
  • Add vickymerzown to CONTRIBUTORS
swh-public-ci added a comment.May 12 2022, 2:39 PM

Build is green

Patch application report for D7795 (id=28239)

Rebasing onto f9919fa8af...

First, rewinding head to replay your work on top of it...
Applying: Reformat test to detect uppercase NPM metadata file
Applying: Add vickymerzown to CONTRIBUTORS
Changes applied before test
commit 092a1e753b3875a9a1482c2821391f43e8aeebae
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Wed May 11 22:11:29 2022 +0530

    Add vickymerzown to CONTRIBUTORS

commit 04cd48a5f149336a4f99fd902c1d7bed28c63dd2
Author: Satvik Vemuganti <vemugantisesha@iitbhilai.ac.in>
Date:   Mon May 9 20:12:55 2022 +0530

    Reformat test to detect uppercase NPM metadata file
    
    Reformat parametrized test using subTest in unittest

See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/224/ for more details.

Harbormaster completed remote builds in B29345: Diff 28239.May 12 2022, 2:39 PM
ardumont accepted this revision.May 12 2022, 3:34 PM
VickyMerzOwn added a comment.May 12 2022, 4:23 PM

I did some horrible things with git. after you accepted my diff, I merged my branch to master. When I tried pushing, it was throwing an error. Turns out that I made a few commits on master before I started working on the new branch. So I tried to squash these commits on master and I squashed a couple of commits that weren't mine, to begin with. Could you please suggest what to do? Right now, it would be easy to just make the changes in a new diff. is this okay?

swh/indexer/tests/test_metadata.py
408–409

I tried making it work, but using @pytest.mark.parametrize is throwing a lot of errors and warnings on running pytest

vlorentz added a comment.EditedMay 12 2022, 4:26 PM
git reset --hard origin/master  # Make your master branch point to the same commit as the remote clone's
git cherry-pick cb1ecf71643d  # Add the first commit on top
git cherry-pick 097346a70d51  # Add the second commit on top
arc diff --update D7795
git push
VickyMerzOwn closed this revision.Jun 21 2022, 9:13 PM

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
1 line--
swh/
indexer/
tests/
64 lines99%
Loading...

Diff 28239

View Options

CONTRIBUTORS

Loading...
View Options

swh/indexer/tests/test_metadata.py

Loading...
About · Developer information · Legal