Differential D3440

loader.hg: Initialize and refactor deprecated tests to use pytest fixture
ClosedPublic
Actions

Authored by ardumont on Jul 7 2020, 9:32 AM.

Details

Reviewers

vlorentz

Group Reviewers

Reviewers

Maniphest Tasks

T2487: Migrate hg loader tests code to pytest

Commits

rDLDHG2308eca5f558: Initialize and refactor deprecated tests to use pytest

Summary

This starts the refactoring of the loader-mercurial tests to use pytest. Taking
the same path we did for loader-svn [1] (one test at a time).

Hopefully, at some point, we will be able to reuse those tests for D3435,
maybe?

Note: This will allow to remove the unit-test based tests scaffolding from the
loader-core (once done).

Related to T2481

[1] T2462

Test Plan

tox

Diff Detail

Repository

rDLDHG Mercurial loader

Branch

migrate-pytest

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 13396
Build 20486: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 20485: arc lint + arc unit

Unit TestsFailed
View All

	Time	Test
	2,068 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.mercurial.tests.test_loader::test_loader_hg_new_visit swh_config = '/tmp/pytest-of-jenkins/pytest-0/test_loader_hg_new_visit0/loader.yml' datadir = '/var/lib/jenkins/workspace/DLDHG/tests-on-diff/.tox/py3/lib/python3.7/site-packages/swh/loader/mercurial/tests/resources' tmp_path = PosixPath('/tmp/pytest-of-jenkins/pytest-0/test_loader_hg_new_visit0')
	173 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.mercurial.tests.test_loader.ArchiveLoaderTest::test_load self = <swh.loader.mercurial.tests.test_loader.ArchiveLoaderTest testMethod=test_load> def test_load(self):
	193 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.mercurial.tests.test_loader.WithReleaseLoaderTest::test_load self = <swh.loader.mercurial.tests.test_loader.WithReleaseLoaderTest testMethod=test_load> def test_load(self):
	149 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.mercurial.tests.test_loader.WithTransplantLoaderTest::test_load self = <swh.loader.mercurial.tests.test_loader.WithTransplantLoaderTest testMethod=test_load> def test_load(self):
	2 ms	Jenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.mercurial.tests.test_converters.TestParseAuthorConverters::test_parse_author_2
		View Full Test Results (4 Failed · 14 Passed)

Event Timeline

ardumont created this revision.Jul 7 2020, 9:32 AM

Herald added a reviewer: Reviewers. · View Herald TranscriptJul 7 2020, 9:32 AM

Build has FAILED

Patch application report for D3440 (id=12176)

Rebasing onto d210f73957...

Current branch diff-target is up to date.

Changes applied before test

commit 54e14bf7e632f4a26d1603185954d3c4a9377078
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 3 16:00:24 2020 +0200

    Initialize and refactor deprecated tests to use pytest
    
    This will allow to remove the base tests scaffolding in core.
    
    Related to T2462

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

Harbormaster failed remote builds in B13396: Diff 12176!Jul 7 2020, 9:33 AM

build has FAILED

ah, yeah the master build is broken [1]
So that needs to be rebased on the fix.

[1] https://jenkins.softwareheritage.org/job/DLDHG/job/tests/691/console

swh/loader/mercurial/tests/test_loader.py
57	That's D3431 but trying to keep things sandboxed (as the latest swh.loader.core is not released yet)

ardumont added inline comments.Jul 7 2020, 9:48 AM

requirements-test.txt
3	yes, should be swh.storage[testing] plus the duplication in tox.ini.

vlorentz accepted this revision.Jul 7 2020, 10:03 AM

vlorentz added a subscriber: vlorentz.

vlorentz added inline comments.

requirements-test.txt
3	could you write this in a comment?
swh/loader/mercurial/tests/conftest.py
43	use pytest's tmpdir fixture

This revision is now accepted and ready to land.Jul 7 2020, 10:03 AM

ardumont added inline comments.Jul 7 2020, 10:06 AM

requirements-test.txt
3	Well, that will go away soonishly as i plan to do as entertained as exchanged [1]. The gist of it is to expose a swh.storage.pytest_plugin. Would that be clear enough? [1] D3428#inline-23730
swh/loader/mercurial/tests/conftest.py
43	oh yeah ;)

ardumont mentioned this in D3435: Add mercurial.from_disk.HgLoaderFromDisk.Jul 7 2020, 10:55 AM

Rebase on latest master (green build)
Adapt using the latest swh.loader.core testing functions

Build is green

Patch application report for D3440 (id=12195)

Rebasing onto 92e2ad85a7...

Current branch diff-target is up to date.

Changes applied before test

commit 2308eca5f55865f970dbb2b572c02c92cb3a464e
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 3 16:00:24 2020 +0200

    Initialize and refactor deprecated tests to use pytest
    
    This will allow to remove the base tests scaffolding in core.
    
    Related to T2462

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

Harbormaster completed remote builds in B13415: Diff 12195.Jul 7 2020, 1:07 PM

ardumont added a task: T2487: Migrate hg loader tests code to pytest.Jul 7 2020, 1:07 PM

ardumont removed a task: T2481: Migrate dvcs loader tests code to pytest.

This starts the refactoring of the loader-mercurial tests to use pytest. Taking
the same path we did for loader-svn [1] (one test at a time).

I'm not sure this is the right path though (i mean 1 diff, 1 refactored test).
I see the pattern to test is quite similar to the git tests ones (using a base class
to test multiple loader implementations).

As a new one is underway, better keep this so we can simply add/replace the implementation to check when ready. maybe?