Fix support for pulling manifest lists via Docker V1 protocol where applicable

This commit is contained in:
Joseph Schorr 2018-11-14 14:05:06 +02:00
parent 37b20010aa
commit 276d0d571d
6 changed files with 48 additions and 9 deletions

View file

@ -1368,7 +1368,7 @@ def test_push_tag_existing_image(v1_protocol, puller, basic_images, liveserver_s
True,
False
])
def test_push_pull_manifest_list_back_compat(v22_protocol, v2_protocol, basic_images,
def test_push_pull_manifest_list_back_compat(v22_protocol, legacy_puller, basic_images,
different_images, liveserver_session, app_reloader,
schema_version, data_model, is_amd):
""" Test: Push a new tag with a manifest list containing two manifests, one (possibly) legacy
@ -1405,9 +1405,9 @@ def test_push_pull_manifest_list_back_compat(v22_protocol, v2_protocol, basic_im
# Pull the tag and ensure we (don't) get back the basic images, since they are(n't) part of the
# amd64+linux manifest.
v2_protocol.pull(liveserver_session, 'devtable', 'newrepo', 'latest', basic_images,
credentials=credentials,
expected_failure=Failures.UNKNOWN_TAG if not is_amd else None)
legacy_puller.pull(liveserver_session, 'devtable', 'newrepo', 'latest', basic_images,
credentials=credentials,
expected_failure=Failures.UNKNOWN_TAG if not is_amd else None)
@pytest.mark.parametrize('schema_version', [