Differential D3555

test.storage: content_add: Use data model object
ClosedPublic
Actions

Authored by ardumont on Jul 17 2020, 5:00 PM.

Details

Reviewers

vlorentz

Group Reviewers

Reviewers

Maniphest Tasks

T2494: tests: Use data model objects within tests (drop dicts)

Commits

rDSTO8c2d6358a567: test.storage: content_add: Use data model object

Summary

It's quite a big test module. So I'll break into small diffs.

Related to T2494

Test Plan

tox

Diff Detail

Repository

rDSTO Storage manager

Branch

master

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 13753
Build 21074: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 21073: arc lint + arc unit

Unit TestsFailed
View All

	Time	Test
	37 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.tests.test_api_client.TestStorage::test_content_add_from_lazy_content self = <swh.storage.tests.test_api_client.TestStorage object at 0x7fd807f9b2e8> swh_storage = <swh.storage.validate.ValidatingProxyStorage object at 0x7fd808173fd0> sample_data_model = {'content': [Content(sha1=b'4\x972t\xcc\xefj\xb4\xdf\xaa\xf8e\x99y/\xa9\xc3\xfeF\x89', sha1_git=b'\xd8\x1c\xc0q\x0e\xb...M\x804\xfa\xec\x9e\xed\xc3\x96\xbe')], 'origin': [Origin(url='file:///dev/null'), Origin(url='file:///dev/zero')], ...}
	4 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.fixer::swh.storage.fixer._fix_content
	2 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.fixer::swh.storage.fixer._fix_origin
	4 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.fixer::swh.storage.fixer._fix_origin_visit
	4 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.storage.fixer::swh.storage.fixer._fix_revision
		View Full Test Results (1 Failed · 786 Passed · 17 Skipped)

Event Timeline

ardumont created this revision.Jul 17 2020, 5:00 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptJul 17 2020, 5:00 PM

Build has FAILED

Patch application report for D3555 (id=12530)

Could not rebase; Attempt merge onto eb2bf8ce68...

Updating eb2bf8ce..7299ddf6
Fast-forward
 swh/storage/tests/test_cassandra.py | 85 ++++++++++++++++++++++---------------
 swh/storage/tests/test_storage.py   | 57 ++++++++++++-------------
 2 files changed, 77 insertions(+), 65 deletions(-)

Changes applied before test

commit 7299ddf6195db70987b70df69c320d37011939ec
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 17:00:29 2020 +0200

    test.storage: content_add: Use data model object
    
    Related to T2494

commit 2b239f02f69c54d067c16054a15976268acbdd12
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 16:37:31 2020 +0200

    test_cassandra: Use data model object
    
    Related to T2494

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

Harbormaster failed remote builds in B13753: Diff 12530!Jul 17 2020, 5:06 PM

Fix comparison

Build is green

Patch application report for D3555 (id=12531)

Could not rebase; Attempt merge onto eb2bf8ce68...

Updating eb2bf8ce..8c2d6358
Fast-forward
 swh/storage/tests/test_cassandra.py | 85 ++++++++++++++++++++++---------------
 swh/storage/tests/test_storage.py   | 57 ++++++++++++-------------
 2 files changed, 77 insertions(+), 65 deletions(-)

Changes applied before test

commit 8c2d6358a56788761817051633d2fe3c20920687
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 17:00:29 2020 +0200

    test.storage: content_add: Use data model object
    
    Related to T2494

commit 2b239f02f69c54d067c16054a15976268acbdd12
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 16:37:31 2020 +0200

    test_cassandra: Use data model object
    
    Related to T2494

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

Harbormaster completed remote builds in B13754: Diff 12531.Jul 17 2020, 5:21 PM

vlorentz accepted this revision.Jul 20 2020, 9:43 AM

This revision is now accepted and ready to land.Jul 20 2020, 9:43 AM

Closed by commit rDSTO8c2d6358a567: test.storage: content_add: Use data model object (authored by ardumont). · Explain WhyJul 20 2020, 9:48 AM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rDSTO8c2d6358a567: test.storage: content_add: Use data model object.