Page MenuHomeSoftware Heritage
Differential D3755

tests: Fix flaky test_resolve_swhids_snapshot_context
ClosedPublic
Actions

Authored by anlambert on Aug 10 2020, 2:54 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDWAPPS9924a39bc52b: tests: Fix flaky test_resolve_swhids_snapshot_context
Summary

Pick the first branch and release in the snapshot instead of randomly
selecting it. As multiple branches can point to a same revision, this
ensures the same branch name will be picked when resolving a SWHID to
a browse URL.

Diff Detail

Repository
rDWAPPS Web applications
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 14483
Build 22273: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 22272: arc lint + arc unit

Event Timeline

anlambert created this revision.Aug 10 2020, 2:54 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptAug 10 2020, 2:54 PM
swh-public-ci added a comment.Aug 10 2020, 3:01 PM

Build is green

Patch application report for D3755 (id=13217)

Rebasing onto 0c15c048b4...

Current branch diff-target is up to date.
Changes applied before test
commit 239e060da46f855ada4112aa02319b3403f6928a
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Mon Aug 10 14:40:54 2020 +0200

    tests: Fix flaky test_resolve_swhids_snapshot_context
    
    Pick the first branch and release in the snapshot instead of randomly
    selecting it. As multiple branches can point to a same revision, this
    ensures the same branch name will be picked when resolving a SWHID to
    a browse URL.

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

Harbormaster completed remote builds in B14482: Diff 13217.Aug 10 2020, 3:01 PM
vlorentz accepted this revision.Aug 10 2020, 3:56 PM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/web/tests/common/test_identifiers.py
428

.keys() is redundant

This revision is now accepted and ready to land.Aug 10 2020, 3:56 PM
anlambert updated this revision to Diff 13218.Aug 10 2020, 4:00 PM

Update: remove call to .keys()

swh-public-ci added a comment.Aug 10 2020, 4:07 PM

Build is green

Patch application report for D3755 (id=13218)

Rebasing onto 0c15c048b4...

Current branch diff-target is up to date.
Changes applied before test
commit 9924a39bc52b4ddb2213c15fb1fbbc43a955660e
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Mon Aug 10 14:40:54 2020 +0200

    tests: Fix flaky test_resolve_swhids_snapshot_context
    
    Pick the first branch and release in the snapshot instead of randomly
    selecting it. As multiple branches can point to a same revision, this
    ensures the same branch name will be picked when resolving a SWHID to
    a browse URL.

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

Harbormaster completed remote builds in B14483: Diff 13218.Aug 10 2020, 4:07 PM
Closed by commit rDWAPPS9924a39bc52b: tests: Fix flaky test_resolve_swhids_snapshot_context (authored by anlambert). · Explain WhyAug 10 2020, 4:07 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPS9924a39bc52b: tests: Fix flaky test_resolve_swhids_snapshot_context.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
web/
tests/
common/
27 lines100%100%

Diff 13218

View Options

swh/web/tests/common/test_identifiers.py

Show First 20 Lines • Show All 417 Lines • ▼ Show 20 Lines
@given(origin_with_multiple_visits()) @given(origin_with_multiple_visits())
def test_resolve_swhids_snapshot_context(client, archive_data, origin): def test_resolve_swhids_snapshot_context(client, archive_data, origin):
visits = archive_data.origin_visit_get(origin["url"]) visits = archive_data.origin_visit_get(origin["url"])
visit = random.choice(visits) visit = random.choice(visits)
snapshot = archive_data.snapshot_get(visit["snapshot"]) snapshot = archive_data.snapshot_get(visit["snapshot"])
head_rev_id = archive_data.snapshot_get_head(snapshot) head_rev_id = archive_data.snapshot_get_head(snapshot)
branch_info = random.choice(
[ branch_info = None
{"name": k, "revision": v["target"]} release_info = None
vlorentzUnsubmitted
Not Done
Inline Actions

.keys() is redundant

vlorentz: `.keys()` is redundant
for k, v in snapshot["branches"].items() for branch_name in sorted(snapshot["branches"]):
if v["target_type"] == "revision" target_type = snapshot["branches"][branch_name]["target_type"]
] target = snapshot["branches"][branch_name]["target"]
) if target_type == "revision" and branch_info is None:
release_info = random.choice( branch_info = {"name": branch_name, "revision": target}
[ elif target_type == "release" and release_info is None:
{"name": k, "release": v["target"]} release_info = {"name": branch_name, "release": target}
for k, v in snapshot["branches"].items() if branch_info and release_info:
if v["target_type"] == "release" break
]
)
release_info["name"] = archive_data.release_get(release_info["release"])["name"] release_info["name"] = archive_data.release_get(release_info["release"])["name"]
directory = archive_data.revision_get(branch_info["revision"])["directory"] directory = archive_data.revision_get(branch_info["revision"])["directory"]
directory_content = archive_data.directory_ls(directory) directory_content = archive_data.directory_ls(directory)
directory_subdirs = [e for e in directory_content if e["type"] == "dir"] directory_subdirs = [e for e in directory_content if e["type"] == "dir"]
directory_subdir = None directory_subdir = None
if directory_subdirs: if directory_subdirs:
directory_subdir = random.choice(directory_subdirs) directory_subdir = random.choice(directory_subdirs)
▲ Show 20 Lines • Show All 139 Lines • Show Last 20 Lines
About · Developer information · Legal