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

fix s3 key list and missing key response

Browse source
This commit is contained in:
Steve Pulec 2013-02-27 01:12:11 -05:00
commit b0d89bb7b7
3 changed files with 121 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

54
tests/test_s3/test_s3.py
View file

@ -1,9 +1,11 @@
import urllib2
import boto
from boto.exception import S3ResponseError
from boto.s3.key import Key
import requests
import sure
from sure import expect
from moto import mock_s3
@ -31,7 +33,7 @@ def test_my_model_save():
model_instance = MyModel('steve', 'is awesome')
model_instance.save()
assert conn.get_bucket('mybucket').get_key('steve').get_contents_as_string() == 'is awesome'
expect(conn.get_bucket('mybucket').get_key('steve').get_contents_as_string()).should.equal('is awesome')
@mock_s3
@ -41,6 +43,14 @@ def test_missing_key():
bucket.get_key("the-key").should.equal(None)
@mock_s3
def test_missing_key_urllib2():
conn = boto.connect_s3('the_key', 'the_secret')
conn.create_bucket("foobar")
urllib2.urlopen.when.called_with("http://foobar.s3.amazonaws.com/the-key").should.throw(urllib2.HTTPError)
@mock_s3
def test_copy_key():
conn = boto.connect_s3('the_key', 'the_secret')
@ -55,6 +65,42 @@ def test_copy_key():
bucket.get_key("new-key").get_contents_as_string().should.equal("some value")
@mock_s3
def test_get_all_keys():
conn = boto.connect_s3('the_key', 'the_secret')
bucket = conn.create_bucket("foobar")
key = Key(bucket)
key.key = "the-key"
key.set_contents_from_string("some value")
key2 = Key(bucket)
key2.key = "folder/some-stuff"
key2.set_contents_from_string("some value")
key3 = Key(bucket)
key3.key = "folder/more-folder/foobar"
key3.set_contents_from_string("some value")
key4 = Key(bucket)
key4.key = "a-key"
key4.set_contents_from_string("some value")
keys = bucket.get_all_keys()
keys.should.have.length_of(3)
keys[0].name.should.equal("a-key")
keys[1].name.should.equal("the-key")
# Prefix
keys[2].name.should.equal("folder")
keys = bucket.get_all_keys(prefix="folder/")
keys.should.have.length_of(2)
keys[0].name.should.equal("folder/some-stuff")
keys[1].name.should.equal("folder/more-folder")
@mock_s3
def test_missing_bucket():
conn = boto.connect_s3('the_key', 'the_secret')
@ -86,8 +132,8 @@ def test_bucket_deletion():
@mock_s3
def test_get_all_buckets():
conn = boto.connect_s3('the_key', 'the_secret')
bucket = conn.create_bucket("foobar")
bucket = conn.create_bucket("foobar2")
conn.create_bucket("foobar")
conn.create_bucket("foobar2")
buckets = conn.get_all_buckets()
buckets.should.have.length_of(2)