Merge branch 'master' into wip-dm-70853

diff --cc s3tests_boto3/functional/test_s3.py
index faae8ffcaa7084be6d48fc198e381d9dab1e457a,94b6c4129bb3bdceea079b1f46251b797f5f8226..c2b2015790d2b577a29dfbe4d3c9850edb97e9e6
--- 1/s3tests_boto3/functional/test_s3.py
--- 2/s3tests_boto3/functional/test_s3.py
+++ b/s3tests_boto3/functional/test_s3.py
@@@ -17991,81 -18223,3 +18223,82 @@@ def test_upload_part_copy_percent_encod
      final_obj = s3_client.get_object(Bucket=bucket_name, Key=key)
      content = final_obj['Body'].read()
      assert content == b"foo"
 +
 +def check_delete_marker(client, bucket, key, status):
 +    dm_header_val = 'none'
 +
 +    try:
 +        res = client.head_object(Bucket=bucket, Key=key)
 +    except ClientError as e:
 +        response_headers = e.response['ResponseMetadata']['HTTPHeaders']
 +        dm_header_val = response_headers['x-amz-delete-marker']
 +
 +    assert dm_header_val == status
 +
 +@pytest.mark.delete_marker
 +@pytest.mark.fails_on_dbstore
 +def test_delete_marker_nonversioned():
 +    bucket = get_new_bucket()
 +    client = get_client()
 +    key = "frodo.txt"
 +    body = "body version %s" % (key)
 +    # no versioning case
 +    res = client.put_object(Bucket=bucket, Key=key, Body=body)
 +    res = client.delete_object(Bucket=bucket, Key=key)
 +    check_delete_marker(client, bucket, key, 'false')
 +
 +@pytest.mark.delete_marker
 +@pytest.mark.fails_on_dbstore
 +def test_delete_marker_versioned():
 +    bucket = get_new_bucket()
 +    client = get_client()
 +    key = "bilbo.txt"
 +    body = "body version %s" % (key)
 +    # versioning case
 +    check_configure_versioning_retry(bucket, "Enabled", "Enabled")
 +    res = client.put_object(Bucket=bucket, Key=key, Body=body)
 +    res = client.delete_object(Bucket=bucket, Key=key)
 +    check_delete_marker(client, bucket, key, 'true')
 +
 +@pytest.mark.delete_marker
 +@pytest.mark.fails_on_dbstore
 +def test_delete_marker_suspended():
 +    bucket = get_new_bucket()
 +    client = get_client()
 +    key = "ringo.txt"
 +    body = "body version %s" % (key)
 +    check_configure_versioning_retry(bucket, "Enabled", "Enabled")
 +    res = client.put_object(Bucket=bucket, Key=key, Body=body)
 +    check_configure_versioning_retry(bucket, "Suspended", "Suspended")
 +    res = client.delete_object(Bucket=bucket, Key=key)
 +    check_delete_marker(client, bucket, key, 'true')
 +
 +@pytest.mark.delete_marker
 +@pytest.mark.lifecycle
 +@pytest.mark.lifecycle_expiration
 +@pytest.mark.fails_on_dbstore
 +def test_delete_marker_expiration():
 +    bucket = get_new_bucket()
 +    client = get_client()
 +    key = "nugent.ted"
 +    body = "body version %s" % (key)
 +    check_configure_versioning_retry(bucket, "Enabled", "Enabled")
 +    res = client.put_object(Bucket=bucket, Key=key, Body=body)
 +    res = client.delete_object(Bucket=bucket, Key=key)
 +    # object should be a delete marker
 +    check_delete_marker(client, bucket, key, 'true')
 +
 +    # to observe delete marker expiration, we must expire any existing
 +    # noncurrent version, as these inhibit delete marker expiration
 +    lifecycle = {
 +        'Rules': [{'Expiration': {'ExpiredObjectDeleteMarker': True}, 'ID': 'dm-1-days', 'Prefix': '', 'Status': 'Enabled'}, {'ID': 'noncur-1-days', 'Prefix': '', 'Status': 'Enabled', 'NoncurrentVersionExpiration': {'NoncurrentDays': 1}}]
 +    }
 +    response = client.put_bucket_lifecycle_configuration(Bucket=bucket, LifecycleConfiguration=lifecycle)
 +    assert response['ResponseMetadata']['HTTPStatusCode'] == 200
 +
 +    lc_interval = get_lc_debug_interval()
 +    time.sleep(6*lc_interval)
 +
 +    # delete marker should have expired
 +    check_delete_marker(client, bucket, key, 'false')
++