← Back to branch summary

~notmyname/swift/deslogging

« back to all changes in this revision

Viewing changes to test/unit/account/test_server.py

  • Committer: John Dickinson
  • Date: 2011-06-15 19:05:28 UTC
  • mfrom: (308.2.5 swift)
  • Revision ID: john.dickinson@rackspace.com-20110615190528-kyw45xq6bvpzs8t6
merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/unit/account/test_server.py
388
388
        self.assertEquals(resp.status_int, 200)
389
389
        self.assertEquals(resp.body.strip().split('\n'), ['c1', 'c2'])
390
390
        self.assertEquals(resp.content_type, 'text/plain')
 
391
        self.assertEquals(resp.charset, 'utf-8')
391
392
 
392
393
    def test_GET_with_containers_json(self):
393
394
        req = Request.blank('/sda1/p/a', environ={'REQUEST_METHOD': 'PUT',
436
437
                          [{'count': 1, 'bytes': 2, 'name': 'c1'},
437
438
                           {'count': 3, 'bytes': 4, 'name': 'c2'}])
438
439
        self.assertEquals(resp.content_type, 'application/json')
 
440
        self.assertEquals(resp.charset, 'utf-8')
439
441
 
440
442
    def test_GET_with_containers_xml(self):
441
443
        req = Request.blank('/sda1/p/a', environ={'REQUEST_METHOD': 'PUT',
529
531
        self.assertEquals(node.firstChild.nodeValue, '3')
530
532
        node = [n for n in container if n.nodeName == 'bytes'][0]
531
533
        self.assertEquals(node.firstChild.nodeValue, '4')
 
534
        self.assertEquals(resp.charset, 'utf-8')
532
535
 
533
536
    def test_GET_limit_marker_plain(self):
534
537
        req = Request.blank('/sda1/p/a', environ={'REQUEST_METHOD': 'PUT',