Skip to content

fix test_list_objects_with_prefix bug when listing #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2018
Merged

fix test_list_objects_with_prefix bug when listing #613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/functional/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,17 +936,17 @@ def test_list_objects_with_prefix(client, log_output):
for i in range(no_of_created_files):
str_i = str(i)
MB_1_reader = LimitedRandomReader(MB_1)
client.put_object(bucket_name, path_prefix + object_name + '_' + str_i, MB_1_reader, MB_1)
client.put_object(bucket_name, path_prefix + str_i + '_' + object_name, MB_1_reader, MB_1)
path_prefix += str_i + '/'
# Created files and directory structure
# ._<bucket_name>/
# |___<object_name>_0
# |___0_<object_name>
# |___0/
# |___<object_name>_1
# |___1_<object_name>
# |___1/
# |___<object_name>_2
# |___2_<object_name>
# |___2/
# |___<object_name>_3
# |___3_<object_name>
#

# Test and verify list_objects api outputs
Expand All @@ -964,9 +964,9 @@ def test_list_objects_with_prefix(client, log_output):
list_objects_api_test(client, bucket_name, 2)

# List objects for '0' directory/prefix without recursive option
# Expect 1 object (directory '0' itself) to be listed
# Expect 2 object (directory '0' and '0_' object) to be listed
log_output.args['prefix'] = prefix = '0'
list_objects_api_test(client, bucket_name, 1, prefix)
list_objects_api_test(client, bucket_name, 2, prefix)

# List objects for '0/' directory/prefix without recursive option
# Expect only 2 objects under directory '0/' to be listed, non-recursive
Expand All @@ -991,7 +991,7 @@ def test_list_objects_with_prefix(client, log_output):
path_prefix = ''
for i in range(no_of_created_files):
str_i = str(i)
client.remove_object(bucket_name, path_prefix + object_name + '_' + str_i)
client.remove_object(bucket_name, path_prefix + str_i + '_' + object_name)
path_prefix += str_i + '/'
client.remove_bucket(bucket_name)
except Exception as err:
Expand Down