← Back to branch summary

~txawsteam/txaws/trunk

« back to all changes in this revision

Viewing changes to txaws/storage/test/test_client.py

  • Committer: Duncan McGreggor
  • Date: 2009-08-18 20:29:18 UTC
  • mfrom: (7.1.2 413741-pep8-cleanup)
  • Revision ID: duncan@canonical.com-20090818202918-h6vxh0y42ics0s93
Merged 413741-pep8-cleanup [r=oubiwann,lifeless] [f=413741].

This change brought comments, docstrings, imports, and long lines into a
semblance of consistency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/storage/test/test_client.py
8
8
from txaws.tests import TXAWSTestCase
9
9
from txaws.storage.client import S3, S3Request, calculateMD5
10
10
 
 
11
 
11
12
class StubbedS3Request(S3Request):
12
13
    def getPage(self, url, method, postdata, headers):
13
14
        self.getPageArgs = (url, method, postdata, headers)
25
26
        DATA = 'objectData'
26
27
        DIGEST = 'zhdB6gwvocWv/ourYUWMxA=='
27
28
 
28
 
        request = S3Request('PUT', 'somebucket', 'object/name/here', DATA, contentType='text/plain', metadata={'foo': 'bar'})
 
29
        request = S3Request(
 
30
            'PUT', 'somebucket', 'object/name/here', DATA, 
 
31
            contentType='text/plain', metadata={'foo': 'bar'})
29
32
        self.assertEqual(request.verb, 'PUT')
30
 
        self.assertEqual(request.getURI(), 'https://s3.amazonaws.com/somebucket/object/name/here')
 
33
        self.assertEqual(
 
34
            request.getURI(),
 
35
            'https://s3.amazonaws.com/somebucket/object/name/here')
31
36
        headers = request.getHeaders()
32
37
        self.assertNotEqual(headers.pop('Date'), '')
33
38
        self.assertEqual(headers,
45
50
 
46
51
        request = S3Request('GET', 'somebucket')
47
52
        self.assertEqual(request.verb, 'GET')
48
 
        self.assertEqual(request.getURI(), 'https://s3.amazonaws.com/somebucket')
 
53
        self.assertEqual(
 
54
            request.getURI(), 'https://s3.amazonaws.com/somebucket')
49
55
        headers = request.getHeaders()
50
56
        self.assertNotEqual(headers.pop('Date'), '')
51
57
        self.assertEqual(headers,
75
81
        req.date = 'Wed, 28 Mar 2007 01:29:59 +0000'
76
82
 
77
83
        headers = req.getHeaders()
78
 
        self.assertEqual(headers['Authorization'], 'AWS 0PN5J17HBGZHT7JJ3X82:jF7L3z/FTV47vagZzhKupJ9oNig=')
 
84
        self.assertEqual(
 
85
            headers['Authorization'],
 
86
            'AWS 0PN5J17HBGZHT7JJ3X82:jF7L3z/FTV47vagZzhKupJ9oNig=')
79
87
 
80
88
 
81
89
class InertRequest(S3Request):
140
148
 
141
149
    def setUp(self):
142
150
        TXAWSTestCase.setUp(self)
143
 
        self.creds = AWSCredentials(access_key='accessKey', secret_key='secretKey')
 
151
        self.creds = AWSCredentials(
 
152
            access_key='accessKey', secret_key='secretKey')
144
153
        self.s3 = TestableS3(creds=self.creds)
145
154
 
146
155
    def test_makeRequest(self):
167
176
        self.assertEqual(req.objectName, None)
168
177
 
169
178
        def _checkResult(buckets):
170
 
            self.assertEqual(list(buckets),
171
 
                             [{'name': u'quotes',
172
 
                               'created': Time.fromDatetime(datetime(2006, 2, 3, 16, 45, 9))},
173
 
                              {'name': u'samples',
174
 
                               'created': Time.fromDatetime(datetime(2006, 2, 3, 16, 41, 58))}])
 
179
            self.assertEqual(
 
180
                list(buckets),
 
181
                [{'name': u'quotes',
 
182
                  'created': Time.fromDatetime(
 
183
                    datetime(2006, 2, 3, 16, 45, 9))},
 
184
                 {'name': u'samples',
 
185
                  'created': Time.fromDatetime(
 
186
                    datetime(2006, 2, 3, 16, 41, 58))}])
175
187
        return d.addCallback(_checkResult)
176
188
 
177
189
    def test_createBucket(self):
191
203
        self.assertEqual(req.objectName, None)
192
204
 
193
205
    def test_putObject(self):
194
 
        self.s3.putObject('foobucket', 'foo', 'data', 'text/plain', {'foo': 'bar'})
 
206
        self.s3.putObject(
 
207
            'foobucket', 'foo', 'data', 'text/plain', {'foo': 'bar'})
195
208
        req = self.s3._lastRequest
196
209
        self.assertTrue(req.submitted)
197
210
        self.assertEqual(req.verb, 'PUT')