catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into adding_rds2_support

Browse source
This commit is contained in:
Mike Fuller 2015-01-30 17:14:13 +11:00
commit d350ac438e
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/test_s3/test_s3.py
View file

@ -496,7 +496,7 @@ def test_bucket_key_listing_order():
# Test delimiter with no prefix
delimiter = '/'
keys = [x.name for x in bucket.list(prefix=None, delimiter=delimiter)]
keys.should.equal(['toplevel'])
keys.should.equal(['toplevel/'])
delimiter = None
keys = [x.name for x in bucket.list(prefix + 'x', delimiter)]

2
tests/test_s3bucket_path/test_s3bucket_path.py
View file

@ -272,7 +272,7 @@ def test_bucket_key_listing_order():
# Test delimiter with no prefix
delimiter = '/'
keys = [x.name for x in bucket.list(prefix=None, delimiter=delimiter)]
keys.should.equal(['toplevel'])
keys.should.equal(['toplevel/'])
delimiter = None
keys = [x.name for x in bucket.list(prefix + 'x', delimiter)]