← Back to branch summary

~oubiwann/txaws/413738-method-name-cleanup

« back to all changes in this revision

Viewing changes to txaws/ec2/tests/test_client.py

  • Committer: Duncan McGreggor
  • Date: 2009-08-18 20:48:59 UTC
  • mfrom: (7.2.1 trunk)
  • Revision ID: duncan@canonical.com-20090818204859-ouzvkpdp8yi5a3uu
Merged from trunk and resolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/ec2/tests/test_client.py
9
9
from txaws.ec2 import client
10
10
from txaws.tests import TXAWSTestCase
11
11
 
 
12
 
12
13
sample_describe_instances_result = """<?xml version="1.0"?>
13
14
<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2008-12-01/">
14
15
    <requestId>52b4c730-f29f-498d-94c1-91efb75994cc</requestId>
49
50
</DescribeInstancesResponse>
50
51
"""
51
52
 
 
53
 
52
54
sample_terminate_instances_result = """<?xml version="1.0"?>
53
55
<TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2008-12-01/">
54
56
  <instancesSet>