tests: Override storage config fixture to not specify journal writer
AbandonedPublic
Actions

Authored by ardumont on Jul 16 2020, 9:23 AM.

Details

Reviewers

None

Group Reviewers

Summary

Prior to this commit, this would instantiate a journal_writer. In effect,
requiring the optional journal dependency which we don't want to test here.

This fixes the debian build [1]

[1] https://jenkins.softwareheritage.org/view/Debian%20packages/job/debian/job/packages/job/DLDBASE/job/gbp-buildpackage/152/console

Not really for review, more to ensure build is still fine (it is locally but...)

Test Plan

tox

Diff Detail

Repository

rDLDBASE Generic VCS/Package Loader

Branch

master

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 13645
Build 20902: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 20901: arc lint + arc unit

Event Timeline

ardumont created this revision.Jul 16 2020, 9:23 AM

Herald added a reviewer: Reviewers. · View Herald TranscriptJul 16 2020, 9:23 AM

ardumont mentioned this in D3501: Use bytes as snapshot id and get rid of dict manipulation in check_snapshot().Jul 16 2020, 9:24 AM

Build is green

Patch application report for D3514 (id=12424)

Rebasing onto e1034bfe27...

Current branch diff-target is up to date.

Changes applied before test

commit 5427bc11e6850b925a56588c76bb7872a39bc164
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Jul 16 09:20:51 2020 +0200

    tests: Override storage config fixture to not specify journal writer
    
    Prior to this commit, this would instantiate a journal_writer. In effect,
    requiring the optional journal dependency which we don't want to test here.
    
    This fixes the debian build [1]
    
    [1] https://jenkins.softwareheritage.org/view/Debian%20packages/job/debian/job/packages/job/DLDBASE/job/gbp-buildpackage/152/console

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

Harbormaster completed remote builds in B13645: Diff 12424.Jul 16 2020, 9:24 AM

Now I realize the problem is more upstream than here though (otherwise, i would need to duplicate this on all clients).
The storage should only expose a fixture which should not pull optional dependencies.

And the storage should itself declare its own conftest with what it wants (with the journal collaborator then)

ardumont mentioned this in D3515: pytest_plugin: Avoid fixture client to declare optional dependency.Jul 16 2020, 9:36 AM

to the benefit of D3515

Revision Contents
Changeset List

Path

Size

Coverage (All)

Coverage (Touched)

swh/

loader/

pytest_plugin.py

18 lines

100%

Diff 12424

View Options

swh/loader/pytest_plugin.py

tests: Override storage config fixture to not specify journal writerAbandonedPublicActions