← Back to branch summary

~tribaal/txaws/xss-hardening

« back to all changes in this revision

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

  • Committer: Duncan McGreggor
  • Date: 2009-08-28 02:32:44 UTC
  • mto: This revision was merged to the branch mainline in revision 12.
  • Revision ID: duncan@canonical.com-20090828023244-6t44fi741heukb8p
- Fixed the creds parameter in the get_ec2_client method.
- Removed redundant code in check_parsed_instances.
- Created a testing subpackage for generally useful testing classes.
- Added fake ec2 client and region classes.
- Moved base test case into new testing module.

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/ec2/tests/test_client.py
8
8
from txaws.credentials import AWSCredentials
9
9
from txaws.ec2 import client
10
10
from txaws.service import AWSServiceEndpoint, EC2_ENDPOINT_US
11
 
from txaws.tests import TXAWSTestCase
 
11
from txaws.testing.base import TXAWSTestCase
12
12
 
13
13
 
14
14
sample_describe_instances_result = """<?xml version="1.0"?>
136
136
 
137
137
    def check_parsed_instances(self, results):
138
138
        instance = results[0]
139
 
        self.assertEquals(instance.instance_id, "i-abcdef01")
140
 
        self.assertEquals(instance.instance_state, "running")
 
139
        # check reservations
141
140
        reservation = instance.reservation
142
141
        self.assertEquals(reservation.reservation_id, "r-cf24b1a6")
143
142
        self.assertEquals(reservation.owner_id, "123456789012")
 
143
        # check groups
144
144
        group = reservation.groups[0]
145
145
        self.assertEquals(group, "default")
 
146
        # check instance
146
147
        self.assertEquals(instance.instance_id, "i-abcdef01")
147
148
        self.assertEquals(instance.instance_state, "running")
148
149
        self.assertEquals(instance.instance_type, "c1.xlarge")
161
162
        self.assertEquals(instance.kernel_id, "aki-b51cf9dc")
162
163
        self.assertEquals(instance.ramdisk_id, "ari-b31cf9da")
163
164
 
164
 
 
165
165
    def test_parse_reservation(self):
166
166
        creds = AWSCredentials("foo", "bar")
167
167
        ec2 = client.EC2Client(creds=creds)