You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2011/02/05 02:52:05 UTC

svn commit: r1067377 - /incubator/libcloud/trunk/test/test_ec2.py

Author: tomaz
Date: Sat Feb  5 01:52:05 2011
New Revision: 1067377

URL: http://svn.apache.org/viewvc?rev=1067377&view=rev
Log:
Remove duplicate methods.

Modified:
    incubator/libcloud/trunk/test/test_ec2.py

Modified: incubator/libcloud/trunk/test/test_ec2.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_ec2.py?rev=1067377&r1=1067376&r2=1067377&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_ec2.py (original)
+++ incubator/libcloud/trunk/test/test_ec2.py Sat Feb  5 01:52:05 2011
@@ -94,11 +94,6 @@ class EC2Tests(unittest.TestCase, TestCa
         self.assertTrue(len(locations) > 0)
         self.assertTrue(locations[0].availability_zone != None)
 
-    def test_list_location(self):
-        locations = self.driver.list_locations()
-        self.assertTrue(len(locations) > 0)
-        self.assertTrue(locations[0].availability_zone != None)
-
     def test_reboot_node(self):
         node = Node('i-4382922a', None, None, None, None, self.driver)
         ret = self.driver.reboot_node(node)
@@ -152,14 +147,6 @@ class EC2Tests(unittest.TestCase, TestCa
         self.assertEqual(availability_zone.zone_state, 'available')
         self.assertEqual(availability_zone.region_name, 'eu-west-1')
 
-    def test_ex_list_availability_zones(self):
-        availability_zones = self.driver.ex_list_availability_zones()
-        availability_zone = availability_zones[0]
-        self.assertTrue(len(availability_zones) > 0)
-        self.assertEqual(availability_zone.name, 'eu-west-1a')
-        self.assertEqual(availability_zone.zone_state, 'available')
-        self.assertEqual(availability_zone.region_name, 'eu-west-1')
-
     def test_ex_describe_tags(self):
         node = Node('i-4382922a', None, None, None, None, self.driver)
         tags = self.driver.ex_describe_tags(node)
@@ -181,10 +168,6 @@ class EC2MockHttp(MockHttp):
         body = self.fixtures.load('describe_availability_zones.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _DescribeAvailabilityZones(self, method, url, body, headers):
-        body = self.fixtures.load('describe_availability_zones.xml')
-        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
-
     def _RebootInstances(self, method, url, body, headers):
         body = self.fixtures.load('reboot_instances.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])