Comment out some bad tests which rely on dict ordering and fix a typo in the gandi driver.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/631bf08e Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/631bf08e Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/631bf08e Branch: refs/heads/trunk Commit: 631bf08e1358b5a107f8da2018084d90bc2f0ef6 Parents: 028bd52 Author: Tomaz Muraus <[email protected]> Authored: Fri Aug 23 15:25:05 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Fri Aug 23 15:25:28 2013 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/gandi.py | 2 +- libcloud/test/compute/test_gce.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/631bf08e/libcloud/compute/drivers/gandi.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/gandi.py b/libcloud/compute/drivers/gandi.py index 32d0a48..57bb5ae 100644 --- a/libcloud/compute/drivers/gandi.py +++ b/libcloud/compute/drivers/gandi.py @@ -64,7 +64,7 @@ INSTANCE_TYPES = { 'disk': 50, 'bandwidth': 10240, }, - 'extra-large': { + 'x-large': { 'id': 'x-large', 'name': 'Extra Large instance', 'cpu': 4, http://git-wip-us.apache.org/repos/asf/libcloud/blob/631bf08e/libcloud/test/compute/test_gce.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py index d991f62..9146d6a 100644 --- a/libcloud/test/compute/test_gce.py +++ b/libcloud/test/compute/test_gce.py @@ -96,7 +96,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): self.assertEqual(len(address_list_all), 4) self.assertEqual(address_list[0].name, 'libcloud-demo-address') self.assertEqual(address_list_uc1[0].name, 'libcloud-demo-address') - self.assertEqual(address_list_all[0].name, 'lcaddress') + #self.assertEqual(address_list_all[0].name, 'lcaddress') def test_ex_list_firewalls(self): firewalls = self.driver.ex_list_firewalls() @@ -129,7 +129,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): self.assertEqual(len(nodes_uc1a), 5) self.assertEqual(nodes[0].name, 'node-name') self.assertEqual(nodes_uc1a[0].name, 'node-name') - self.assertEqual(nodes_all[0].name, 'libcloud-demo-persist-node') + #self.assertEqual(nodes_all[0].name, 'libcloud-demo-persist-node') def test_list_sizes(self): sizes = self.driver.list_sizes() @@ -138,8 +138,8 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): self.assertEqual(len(sizes_all), 100) self.assertEqual(sizes[0].name, 'f1-micro') self.assertEqual(sizes[0].extra['zone'].name, 'us-central1-a') - self.assertEqual(sizes_all[0].name, 'n1-highmem-8') - self.assertEqual(sizes_all[0].extra['zone'].name, 'us-central1-a') + #self.assertEqual(sizes_all[0].name, 'n1-highmem-8') + #self.assertEqual(sizes_all[0].extra['zone'].name, 'us-central1-a') def test_list_volumes(self): volumes = self.driver.list_volumes() @@ -149,7 +149,7 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin): self.assertEqual(len(volumes_all), 3) self.assertEqual(len(volumes_uc1a), 3) self.assertEqual(volumes[0].name, 'lcdisk') - self.assertEqual(volumes_all[0].name, 'test-disk') + #self.assertEqual(volumes_all[0].name, 'test-disk') self.assertEqual(volumes_uc1a[0].name, 'lcdisk') def test_ex_list_zones(self):
