Page MenuHomeSoftware Heritage
Differential D4951

Remove tests' journal_data.py in favor of the version in swh-model
ClosedPublic
Actions

Authored by douardda on Jan 26 2021, 5:09 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Maniphest Tasks
T2970: Make swh-journal tests not depend on swh-model any more
Commits
rDJNL9703864ef366: Remove tests' journal_data.py in favor of the version in swh-model
Summary

prevent unnecessary coupling with swh-model.

Related to T2970.
Depends on D4950, still misses the dependency bump on swh-model (needs a tag).

Diff Detail

Repository
rDJNL Journal infrastructure
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

douardda created this revision.Jan 26 2021, 5:09 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJan 26 2021, 5:09 PM
swh-public-ci added a comment.Jan 26 2021, 5:09 PM

Build has FAILED

Patch application report for D4951 (id=17636)

Rebasing onto c451ecd542...

Current branch diff-target is up to date.
Changes applied before test
commit d91600aaee0a71c798446f8676a04e64773bdb25
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Jan 19 10:21:41 2021 +0100

    Remove tests' journal_data.py in favor of the version in swh-model
    
    prevent unnecessary coupling with swh-model.
    
    Related to T2970.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Jan 26 2021, 5:09 PM
Harbormaster failed remote builds in B18774: Diff 17636!
douardda updated this revision to Diff 17641.Jan 26 2021, 5:26 PM

bump dependency on swh-model 0.12

swh-public-ci added a comment.Jan 26 2021, 5:27 PM

Build has FAILED

Patch application report for D4951 (id=17641)

Rebasing onto c451ecd542...

Current branch diff-target is up to date.
Changes applied before test
commit 70519211ed438cfbf7c3bf593f3d957d342e7708
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Jan 19 10:21:41 2021 +0100

    Remove tests' journal_data.py in favor of the version in swh-model
    
    prevent unnecessary coupling with swh-model.
    
    Related to T2970.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Jan 26 2021, 5:27 PM
Harbormaster failed remote builds in B18779: Diff 17641!
swh-public-ci added a comment.Jan 26 2021, 5:32 PM

Build is green

Patch application report for D4951 (id=17641)

Rebasing onto c451ecd542...

Current branch diff-target is up to date.
Changes applied before test
commit 70519211ed438cfbf7c3bf593f3d957d342e7708
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Jan 19 10:21:41 2021 +0100

    Remove tests' journal_data.py in favor of the version in swh-model
    
    prevent unnecessary coupling with swh-model.
    
    Related to T2970.

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

Harbormaster completed remote builds in B18779: Diff 17641.Jan 26 2021, 5:32 PM
douardda requested review of this revision.Jan 26 2021, 5:32 PM
ardumont requested changes to this revision.Jan 26 2021, 5:42 PM
ardumont added a subscriber: ardumont.

for the sake of my questions

swh/journal/serializers.py
74

Is that in the scope?

95

please, remove ;)

swh/journal/tests/conftest.py
0

shouldn't this go in model as you did the other stuff?

This revision now requires changes to proceed.Jan 26 2021, 5:42 PM
douardda added inline comments.Jan 27 2021, 9:54 AM
swh/journal/serializers.py
95

But I have.. wait, wat? ah no I have not... (sorry)

douardda added inline comments.Jan 27 2021, 9:57 AM
swh/journal/tests/conftest.py
0

No but we should probably just use swh.model.hypothesis_strategies.object_dicts instead

douardda added inline comments.Jan 27 2021, 10:00 AM
swh/journal/tests/conftest.py
0

actually it's not used any more at all, so let's get rid of it

douardda updated this revision to Diff 17649.Jan 27 2021, 10:27 AM

remove stuff added mistakenly, and properly deprecate journal_data instead of breaking swh-storage

swh-public-ci added a comment.Jan 27 2021, 10:29 AM

Build is green

Patch application report for D4951 (id=17649)

Rebasing onto c451ecd542...

Current branch diff-target is up to date.
Changes applied before test
commit 2b9e9197c7da0bfb5741724a02a061c33d0cf4a2
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Jan 19 10:21:41 2021 +0100

    Remove tests' journal_data.py in favor of the version in swh-model
    
    prevent unnecessary coupling with swh-model.
    
    Related to T2970.

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

Harbormaster completed remote builds in B18788: Diff 17649.Jan 27 2021, 10:29 AM
douardda updated this revision to Diff 17650.Jan 27 2021, 10:32 AM

set the DeprecationWarning category in journal_data

swh-public-ci added a comment.Jan 27 2021, 10:34 AM

Build is green

Patch application report for D4951 (id=17650)

Rebasing onto c451ecd542...

Current branch diff-target is up to date.
Changes applied before test
commit 9703864ef366904e719fafa2f6192cc5b0a1f07e
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Jan 19 10:21:41 2021 +0100

    Remove tests' journal_data.py in favor of the version in swh-model
    
    prevent unnecessary coupling with swh-model.
    
    Related to T2970.

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

Harbormaster completed remote builds in B18789: Diff 17650.Jan 27 2021, 10:34 AM
ardumont accepted this revision.Jan 27 2021, 11:07 AM

lgtm

Thanks

swh/journal/tests/conftest.py
0

\m/

This revision is now accepted and ready to land.Jan 27 2021, 11:07 AM
Closed by commit rDJNL9703864ef366: Remove tests' journal_data.py in favor of the version in swh-model (authored by douardda). · Explain WhyJan 27 2021, 3:38 PM
This revision was automatically updated to reflect the committed changes.
douardda added a commit: rDJNL9703864ef366: Remove tests' journal_data.py in favor of the version in swh-model.

Revision Contents
Changeset List

Diff 17674

View Options

requirements-swh.txt

Loading...
View Options

swh/journal/pytest_plugin.py

Loading...
View Options

swh/journal/serializers.py

Loading...
View Options

swh/journal/tests/conftest.py

Loading...
View Options

swh/journal/tests/journal_data.py

Loading...
View Options

swh/journal/tests/test_journal_data.py

Loading...
View Options

swh/journal/tests/test_kafka_writer.py

Loading...
View Options

swh/journal/tests/test_serializers.py

Loading...
About · Developer information · Legal