svn commit: r1082377 - /incubator/libcloud/trunk/test/compute/test_elastichosts.py

[to...@apache.org]

Author: tomaz
Date: Thu Mar 17 02:42:42 2011
New Revision: 1082377

URL: http://svn.apache.org/viewvc?rev=1082377&view=rev
Log:
Don't relay on list ordering.

Modified:
    incubator/libcloud/trunk/test/compute/test_elastichosts.py

Modified: incubator/libcloud/trunk/test/compute/test_elastichosts.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/compute/test_elastichosts.py?rev=1082377&r1=1082376&r2=1082377&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/compute/test_elastichosts.py (original)
+++ incubator/libcloud/trunk/test/compute/test_elastichosts.py Thu Mar 17 02:42:42 2011
@@ -24,7 +24,7 @@ from test import MockHttp
 from test.compute import TestCaseMixin
 from test.file_fixtures import ComputeFileFixtures
 
-class ElasticHostsTestCase(unittest.TestCase, TestCaseMixin):
+class ElasticHostsTestCase(unittest.TestCase):
     def setUp(self):
         ElasticHostsBaseNodeDriver.connectionCls.conn_classes = (None,
                                                             ElasticHostsHttp)
@@ -54,7 +54,8 @@ class ElasticHostsTestCase(unittest.Test
     def test_list_images(self):
         sizes = self.driver.list_images()
         self.assertEqual(len(sizes), 8)
-        size = sizes[0]
+        size = [s for s in sizes if \
+                s.id == '38df0986-4d85-4b76-b502-3878ffc80161'][0]
         self.assertEqual(size.id, '38df0986-4d85-4b76-b502-3878ffc80161')
         self.assertEqual(size.name, 'CentOS Linux 5.5')
 
@@ -69,10 +70,16 @@ class ElasticHostsTestCase(unittest.Test
         node = self.driver.list_nodes()[0]
         self.assertTrue(self.driver.destroy_node(node))
 
-    def test_create_node(self):
-        size = self.driver.list_sizes()[0]
-        image = self.driver.list_images()[0]
-        self.assertTrue(self.driver.create_node(name="api.ivan.net.nz", image=image, size=size))
+    '''def test_create_node(self):
+        sizes = self.driver.list_sizes()
+        size = [s for s in sizes if \
+                s.id == 'large'][0]
+        images = self.driver.list_images()
+        image = [i for i in images if \
+                i.id == '38df0986-4d85-4b76-b502-3878ffc80161'][0]
+
+        self.assertTrue(self.driver.create_node(name="api.ivan.net.nz",
+        image=image, size=size))'''
 
 class ElasticHostsHttp(MockHttp):