Paths

Table of Contentst

Differential D4212

Deprecate the `args` argument to get_objstorage in favor of kwargs
ClosedPublic
Actions

Authored by olasd on Oct 8 2020, 10:01 PM.

Details

Reviewers

ardumont

Group Reviewers

Reviewers

Commits

rDOBJSaa19b280840c: Coalesce successful server config loading tests into a single one
rDOBJS289f9709f595: Replace manual pytest.raises mangling with the match argument
rDOBJSb78406dcecc4: Deprecate the `args` argument to get_objstorage in favor of kwargs

Summary

This makes get_objstorage consistent with most of the other get_foo factories
available in other swh modules.

We will need to do a pass to drop the few hundred args that are used
currently.

Test Plan

tox tests updated

Diff Detail

Repository

rDOBJS Object storage

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

olasd created this revision.Oct 8 2020, 10:01 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptOct 8 2020, 10:01 PM

Build is green

Patch application report for D4212 (id=14847)

Rebasing onto 6a9896d628...

First, rewinding head to replay your work on top of it...
Applying: Deprecate the `args` argument to get_objstorage in favor of kwargs

Changes applied before test

commit 4c4364c6b0593808d60d3d145710d20f280ad210
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Oct 8 21:59:20 2020 +0200

    Deprecate the `args` argument to get_objstorage in favor of kwargs
    
    This makes get_objstorage consistent with most of the other `get_foo` factories
    available in other swh modules.
    
    We will need to do a pass to drop the few hundred `args` that are used
    currently.

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

Harbormaster completed remote builds in B16085: Diff 14847.Oct 8 2020, 10:02 PM

Rebase

Build is green

Patch application report for D4212 (id=14848)

Rebasing onto 6a9896d628...

Current branch diff-target is up to date.

Changes applied before test

commit b78406dcecc4c442fa08ad21e615354e813d5935
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Oct 8 21:59:20 2020 +0200

    Deprecate the `args` argument to get_objstorage in favor of kwargs
    
    This makes get_objstorage consistent with most of the other `get_foo` factories
    available in other swh modules.
    
    We will need to do a pass to drop the few hundred `args` that are used
    currently.

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

Harbormaster completed remote builds in B16086: Diff 14848.Oct 8 2020, 10:04 PM

lgtm, a couple of suggestions inline ;)

swh/objstorage/tests/test_server.py

jsyk, we can (and use) and mostly do now the simplified version of:

with pytest.raises(KeyError, match="missing cls config entry"):
    load_and_check_config(config_path)

126

And for this ^ 3 scenarios, I would be tempted to use pytest parametrize functionality [1]:

@pytest.mark.parametrize("config", [
    {"objstorage": {"cls": "pathslicing", "root": "root", "slicing": "slicing"}},
    {"client_max_size": "10", "objstorage": {"cls": "memory", "args": {}}},
    {"client_max_size": "10", "objstorage": {"cls": "memory"}}
])
def test_load_and_check_config(config, tmpdir):
    config_path = prepare_config_file(tmpdir, config)
    cfg = load_and_check_config(config_path)
    assert cfg == config

[1] unsure whether the tmpdir fixture injection is working with this though ¯\_(ツ)_/¯

This revision is now accepted and ready to land.Oct 9 2020, 8:54 AM

Apply ardumont's comments

olasd marked 2 inline comments as done.Oct 9 2020, 12:06 PM

Build is green

Patch application report for D4212 (id=14855)

Rebasing onto 6a9896d628...

Current branch diff-target is up to date.

Changes applied before test

commit aa19b280840c0bd1e47d9d4741fa76bf9a4df7db
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Oct 9 12:04:38 2020 +0200

    Coalesce successful server config loading tests into a single one

commit 289f9709f5951e28f480f1ae67f2bd60ef14eb26
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Oct 9 12:03:28 2020 +0200

    Replace manual pytest.raises mangling with the match argument

commit b78406dcecc4c442fa08ad21e615354e813d5935
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Thu Oct 8 21:59:20 2020 +0200

    Deprecate the `args` argument to get_objstorage in favor of kwargs
    
    This makes get_objstorage consistent with most of the other `get_foo` factories
    available in other swh modules.
    
    We will need to do a pass to drop the few hundred `args` that are used
    currently.

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

Harbormaster completed remote builds in B16093: Diff 14855.Oct 9 2020, 12:07 PM

Closed by commit rDOBJSb78406dcecc4: Deprecate the `args` argument to get_objstorage in favor of kwargs (authored by olasd). · Explain WhyOct 9 2020, 12:23 PM

This revision was automatically updated to reflect the committed changes.

olasd added a commit: rDOBJSb78406dcecc4: Deprecate the `args` argument to get_objstorage in favor of kwargs.

olasd added a commit: rDOBJS289f9709f595: Replace manual pytest.raises mangling with the match argument.

olasd added a commit: rDOBJSaa19b280840c: Coalesce successful server config loading tests into a single one.