← Back to branch summary

~notmyname/swift/saio_reference

« back to all changes in this revision

Viewing changes to test/unit/container/test_server.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/unit/container/test_server.py
514
514
        resp = self.controller.GET(req)
515
515
        self.assertEquals(resp.content_type, 'application/json')
516
516
        self.assertEquals(eval(resp.body), json_body)
 
517
        self.assertEquals(resp.charset, 'utf-8')
517
518
 
518
519
        for accept in ('application/json', 'application/json;q=1.0,*/*;q=0.9',
519
520
                 '*/*;q=0.9,application/json;q=1.0', 'application/*'):
552
553
        resp = self.controller.GET(req)
553
554
        self.assertEquals(resp.content_type, 'text/plain')
554
555
        self.assertEquals(resp.body, plain_body)
 
556
        self.assertEquals(resp.charset, 'utf-8')
555
557
 
556
558
        for accept in ('', 'text/plain', 'application/xml;q=0.8,*/*;q=0.9',
557
559
                '*/*;q=0.9,application/xml;q=0.8', '*/*',
609
611
        resp = self.controller.GET(req)
610
612
        self.assertEquals(resp.content_type, 'application/xml')
611
613
        self.assertEquals(resp.body, xml_body)
 
614
        self.assertEquals(resp.charset, 'utf-8')
612
615
 
613
616
        for xml_accept in ('application/xml', 'application/xml;q=1.0,*/*;q=0.9',
614
617
                 '*/*;q=0.9,application/xml;q=1.0', 'application/xml,text/xml'):