Move test from NimbusTests to EC2Tests class.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1655e850 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1655e850 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1655e850 Branch: refs/heads/trunk Commit: 1655e850a71cca1af35ece6f795aa44fa5029958 Parents: 11abec4 Author: Tomaz Muraus <[email protected]> Authored: Mon Dec 23 19:16:58 2013 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Mon Dec 23 19:16:58 2013 +0100 ---------------------------------------------------------------------- libcloud/test/compute/test_ec2.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/1655e850/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 0222d08..e0536a5 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -197,6 +197,22 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): '2009-08-07T05:47:04.000Z') self.assertTrue('instancetype' in ret_node2.extra) + def test_list_reserved_nodes(self): + node = self.driver.list_reserved_nodes()[0] + self.assertEqual(node.id, '93bbbca2-c500-49d0-9ede-9d8737400498') + self.assertEqual(node.state, 'active') + self.assertEqual(node.extra['instance_type'], 't1.micro') + self.assertEqual(node.extra['availability'], 'us-east-1b') + self.assertEqual(node.extra['start'], '2013-06-18T12:07:53.161Z') + self.assertEqual(node.extra['duration'], 31536000) + self.assertEqual(node.extra['usage_price'], 0.012) + self.assertEqual(node.extra['fixed_price'], 23.0) + self.assertEqual(node.extra['instance_count'], 1) + self.assertEqual(node.extra['description'], 'Linux/UNIX') + self.assertEqual(node.extra['instance_tenancy'], 'default') + self.assertEqual(node.extra['currency_code'], 'USD') + self.assertEqual(node.extra['offering_type'], 'Light Utilization') + def test_list_nodes_with_name_tag(self): EC2MockHttp.type = 'WITH_TAGS' node = self.driver.list_nodes()[0] @@ -1109,22 +1125,6 @@ class NimbusTests(EC2Tests): self.assertTrue('m1.large' in ids) self.assertTrue('m1.xlarge' in ids) - def test_list_reserved_nodes(self): - node = self.driver.list_reserved_nodes()[0] - self.assertEqual(node.id, '93bbbca2-c500-49d0-9ede-9d8737400498') - self.assertEqual(node.state, 'active') - self.assertEqual(node.extra['instance_type'], 't1.micro') - self.assertEqual(node.extra['availability'], 'us-east-1b') - self.assertEqual(node.extra['start'], '2013-06-18T12:07:53.161Z') - self.assertEqual(node.extra['duration'], 31536000) - self.assertEqual(node.extra['usage_price'], 0.012) - self.assertEqual(node.extra['fixed_price'], 23.0) - self.assertEqual(node.extra['instance_count'], 1) - self.assertEqual(node.extra['description'], 'Linux/UNIX') - self.assertEqual(node.extra['instance_tenancy'], 'default') - self.assertEqual(node.extra['currency_code'], 'USD') - self.assertEqual(node.extra['offering_type'], 'Light Utilization') - def test_list_nodes(self): # overridden from EC2Tests -- Nimbus doesn't support elastic IPs. node = self.driver.list_nodes()[0]
