← Back to branch summary

~hudson-openstack/swift/trunk

« back to all changes in this revision

Viewing changes to test/functional/tests.py

  • Committer: Tarmac
  • Author(s): gholt
  • Date: 2011-06-13 21:01:07 UTC
  • mfrom: (306.1.4 utfdash8)
  • Revision ID: tarmac-20110613210107-mnvngsf9cfu2px1x
Fixed account and container listings so they return with charset=utf-8 instead of utf8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/functional/tests.py
227
227
            headers = dict(self.env.conn.response.getheaders())
228
228
            if format == 'json':
229
229
                self.assertEquals(headers['content-type'],
230
 
                    'application/json; charset=utf8')
 
230
                    'application/json; charset=utf-8')
231
231
            elif format == 'xml':
232
232
                self.assertEquals(headers['content-type'],
233
 
                    'application/xml; charset=utf8')
 
233
                    'application/xml; charset=utf-8')
234
234
 
235
235
    def testListingLimit(self):
236
236
        limit = 10000
1355
1355
            headers = dict(self.env.conn.response.getheaders())
1356
1356
            if format == 'json':
1357
1357
                self.assertEquals(headers['content-type'],
1358
 
                    'application/json; charset=utf8')
 
1358
                    'application/json; charset=utf-8')
1359
1359
            elif format == 'xml':
1360
1360
                self.assertEquals(headers['content-type'],
1361
 
                    'application/xml; charset=utf8')
 
1361
                    'application/xml; charset=utf-8')
1362
1362
 
1363
1363
        lm_diff = max([f['last_modified'] for f in files]) - \
1364
1364
            min([f['last_modified'] for f in files])