Skip to content

Commit

Permalink
Increase presigned timeouts for functional tests (#821)
Browse files Browse the repository at this point in the history
  • Loading branch information
harshavardhana authored and kannappanr committed Nov 9, 2019
1 parent 14f7de0 commit 2c08c5b
Showing 1 changed file with 18 additions and 13 deletions.
31 changes: 18 additions & 13 deletions tests/functional/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ def test_presigned_get_object_default_expiry(client, log_output):
print(log_output.json_report())


def test_presigned_get_object_expiry_5sec(client, log_output):
def test_presigned_get_object_expiry(client, log_output):
# default value for log_output.function attribute is;
# log_output.function = "presigned_get_object(bucket_name, object_name, expires, response_headers)"

Expand All @@ -1327,7 +1327,7 @@ def test_presigned_get_object_expiry_5sec(client, log_output):

presigned_get_object_url = client.presigned_get_object(bucket_name,
object_name,
timedelta(seconds=5))
timedelta(seconds=120))

log_output.args['presigned_get_object_url'] = presigned_get_object_url

Expand All @@ -1343,8 +1343,13 @@ def test_presigned_get_object_expiry_5sec(client, log_output):
'GET',
bucket_name,
object_name).get_exception()
# Wait for 5 seconds for the presigned url to expire
time.sleep(5)

presigned_get_object_url = client.presigned_get_object(bucket_name,
object_name,
timedelta(seconds=1))

# Wait for 2 seconds for the presigned url to expire
time.sleep(2)
response = _http.urlopen('GET', presigned_get_object_url)

log_output.args['response.status-2'] = response.status
Expand Down Expand Up @@ -1391,7 +1396,7 @@ def test_presigned_get_object_response_headers(client, log_output):
'response-content-language': content_language}
presigned_get_object_url = client.presigned_get_object(bucket_name,
object_name,
timedelta(seconds=5),
timedelta(seconds=120),
response_headers)
log_output.args['presigned_get_object_url'] = presigned_get_object_url

Expand Down Expand Up @@ -1465,7 +1470,7 @@ def test_presigned_put_object_default_expiry(client, log_output):
print(log_output.json_report())


def test_presigned_put_object_expiry_5sec(client, log_output):
def test_presigned_put_object_expiry(client, log_output):
# default value for log_output.function attribute is;
# log_output.function = "presigned_put_object(bucket_name, object_name, expires)"

Expand All @@ -1483,9 +1488,9 @@ def test_presigned_put_object_expiry_5sec(client, log_output):

presigned_put_object_url = client.presigned_put_object(bucket_name,
object_name,
timedelta(seconds=5))
# Wait for 5 seconds for the presigned url to expire
time.sleep(5)
timedelta(seconds=1))
# Wait for 2 seconds for the presigned url to expire
time.sleep(2)
response = _http.urlopen('PUT',
presigned_put_object_url,
LimitedRandomReader(KB_1))
Expand Down Expand Up @@ -2036,17 +2041,17 @@ def main():
log_output = LogOutput(client.presigned_get_object, 'test_presigned_get_object_default_expiry')
test_presigned_get_object_default_expiry(client, log_output)

log_output = LogOutput(client.presigned_get_object, 'test_presigned_get_object_expiry_5sec')
test_presigned_get_object_expiry_5sec(client, log_output)
log_output = LogOutput(client.presigned_get_object, 'test_presigned_get_object_expiry')
test_presigned_get_object_expiry(client, log_output)

log_output = LogOutput(client.presigned_get_object, 'test_presigned_get_object_response_headers')
test_presigned_get_object_response_headers(client, log_output)

log_output = LogOutput(client.presigned_put_object, 'test_presigned_put_object_default_expiry')
test_presigned_put_object_default_expiry(client, log_output)

log_output = LogOutput(client.presigned_put_object, 'test_presigned_put_object_expiry_5sec')
test_presigned_put_object_expiry_5sec(client, log_output)
log_output = LogOutput(client.presigned_put_object, 'test_presigned_put_object_expiry')
test_presigned_put_object_expiry(client, log_output)

log_output = LogOutput(client.presigned_post_policy, 'test_presigned_post_policy')
test_presigned_post_policy(client, log_output)
Expand Down

0 comments on commit 2c08c5b

Please sign in to comment.