~didrocks/unity/altf10

« back to all changes in this revision

Viewing changes to grackle/tests/test_client.py

  • Committer: Curtis Hovey
  • Date: 2012-01-31 03:22:02 UTC
  • mto: This revision was merged to the branch mainline in revision 37.
  • Revision ID: curtis.hovey@canonical.com-20120131032202-b4r9msw4107zvkig
Reanme make_json_message => make_message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
    )
26
26
 
27
27
 
28
 
def make_json_message(text, message_id='foo',
29
 
                      headers=None, attachment_type=None):
 
28
def make_message(message_id, text, headers=None, attachment_type=None):
30
29
    message = MIMEMultipart()
31
30
    message.attach(MIMEText(text))
32
31
    message['Message-Id'] = message_id
491
490
        client = GrackleClient('localhost', 8446)
492
491
        with ForkedFakeService.from_client(client,
493
492
            {'baz': [
494
 
                make_json_message(
495
 
                    'abcdefghi', message_id='foo',
 
493
                make_message(
 
494
                    'foo', 'abcdefghi',
496
495
                    headers={'From': 'me', 'To': 'you'},
497
496
                    attachment_type='text/x-diff')
498
497
            ]}):
507
506
        client = GrackleClient('localhost', 8447)
508
507
        with ForkedFakeService.from_client(client,
509
508
            {'baz': [
510
 
                make_json_message(
511
 
                    'abcdefghi', message_id='foo',
 
509
                make_message(
 
510
                    'foo', 'abcdefghi',
512
511
                    headers={'From': 'me', 'To': 'you'},
513
512
                    attachment_type='text/x-diff')
514
513
            ]}):