Merging in latest boto.

boto/tests/test_ec2connection.py

Index: boto/tests/test_ec2connection.py
diff --git a/boto/tests/test_ec2connection.py b/boto/tests/test_ec2connection.py
deleted file mode 100644
index 046ff92f8f51ff9e8c5632f1c8801f11c2cd8721..0000000000000000000000000000000000000000
--- a/boto/tests/test_ec2connection.py
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2006-2010 Mitch Garnaat http://garnaat.org/
-# Copyright (c) 2009, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish, dis-
-# tribute, sublicense, and/or sell copies of the Software, and to permit
-# persons to whom the Software is furnished to do so, subject to the fol-
-# lowing conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-"""
-Some unit tests for the EC2Connection
-"""
-
-import unittest
-import time
-from boto.ec2.connection import EC2Connection
-import telnetlib
-import socket
-
-class EC2ConnectionTest (unittest.TestCase):
-
-    def test_1_basic(self):
-        # this is my user_id, if you want to run these tests you should
-        # replace this with yours or they won't work
-        user_id = '963068290131'
-        print '--- running EC2Connection tests ---'
-        c = EC2Connection()
-        # get list of private AMI's
-        rs = c.get_all_images(owners=[user_id])
-        assert len(rs) > 0
-        # now pick the first one
-        image = rs[0]
-        # temporarily make this image runnable by everyone
-        status = image.set_launch_permissions(group_names=['all'])
-        assert status
-        d = image.get_launch_permissions()
-        assert d.has_key('groups')
-        assert len(d['groups']) > 0
-        # now remove that permission
-        status = image.remove_launch_permissions(group_names=['all'])
-        assert status
-        d = image.get_launch_permissions()
-        assert not d.has_key('groups')
-        
-        # create 2 new security groups
-        group1_name = 'test-%d' % int(time.time())
-        group_desc = 'This is a security group created during unit testing'
-        group1 = c.create_security_group(group1_name, group_desc)
-        time.sleep(2)
-        group2_name = 'test-%d' % int(time.time())
-        group_desc = 'This is a security group created during unit testing'
-        group2 = c.create_security_group(group2_name, group_desc)
-        # now get a listing of all security groups and look for our new one
-        rs = c.get_all_security_groups()
-        found = False
-        for g in rs:
-            if g.name == group1_name:
-                found = True
-        assert found
-        # now pass arg to filter results to only our new group
-        rs = c.get_all_security_groups([group1_name])
-        assert len(rs) == 1
-        # try some group to group authorizations/revocations
-        # first try the old style
-        status = c.authorize_security_group(group1.name, group2.name, group2.owner_id)
-        assert status
-        status = c.revoke_security_group(group1.name, group2.name, group2.owner_id)
-        assert status
-        # now try specifying a specific port
-        status = c.authorize_security_group(group1.name, group2.name, group2.owner_id,
-                                            'tcp', 22, 22)
-        assert status
-        status = c.revoke_security_group(group1.name, group2.name, group2.owner_id,
-                                         'tcp', 22, 22)
-        assert status
-        
-        # now delete the second security group
-        status = c.delete_security_group(group2_name)
-        # now make sure it's really gone
-        rs = c.get_all_security_groups()
-        found = False
-        for g in rs:
-            if g.name == group2_name:
-                found = True
-        assert not found
-
-        group = group1
-        
-        # now try to launch apache image with our new security group
-        rs = c.get_all_images()
-        img_loc = 'ec2-public-images/fedora-core4-apache.manifest.xml'
-        for image in rs:
-            if image.location == img_loc:
-                break
-        reservation = image.run(security_groups=[group.name])
-        instance = reservation.instances[0]
-        while instance.state != 'running':
-            print '\tinstance is %s' % instance.state
-            time.sleep(30)
-            instance.update()
-        # instance in now running, try to telnet to port 80
-        t = telnetlib.Telnet()
-        try:
-            t.open(instance.dns_name, 80)
-        except socket.error:
-            pass
-        # now open up port 80 and try again, it should work
-        group.authorize('tcp', 80, 80, '0.0.0.0/0')
-        t.open(instance.dns_name, 80)
-        t.close()
-        # now revoke authorization and try again
-        group.revoke('tcp', 80, 80, '0.0.0.0/0')
-        try:
-            t.open(instance.dns_name, 80)
-        except socket.error:
-            pass
-        # now kill the instance and delete the security group
-        instance.terminate()
-        # unfortunately, I can't delete the sg within this script
-        #sg.delete()
-        
-        # create a new key pair
-        key_name = 'test-%d' % int(time.time())
-        status = c.create_key_pair(key_name)
-        assert status
-        # now get a listing of all key pairs and look for our new one
-        rs = c.get_all_key_pairs()
-        found = False
-        for k in rs:
-            if k.name == key_name:
-                found = True
-        assert found
-        # now pass arg to filter results to only our new key pair
-        rs = c.get_all_key_pairs([key_name])
-        assert len(rs) == 1
-        key_pair = rs[0]
-        # now delete the key pair
-        status = c.delete_key_pair(key_name)
-        # now make sure it's really gone
-        rs = c.get_all_key_pairs()
-        found = False
-        for k in rs:
-            if k.name == key_name:
-                found = True
-        assert not found
-
-        # short test around Paid AMI capability
-        demo_paid_ami_id = 'ami-bd9d78d4'
-        demo_paid_ami_product_code = 'A79EC0DB'
-        l = c.get_all_images([demo_paid_ami_id])
-        assert len(l) == 1
-        assert len(l[0].product_codes) == 1
-        assert l[0].product_codes[0] == demo_paid_ami_product_code
-        
-        print '--- tests completed ---'