From 10337162ea51d2911b963cc3528ed9eb5d0f45c5 Mon Sep 17 00:00:00 2001 From: Kashyap Kopparam Date: Fri, 5 Sep 2014 18:07:31 +0530 Subject: [PATCH] Venu & Kashyap | Removed live_snaphot method and changed an assert --- ec2driver.py | 4 ---- tests/test_ec2driver.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ec2driver.py b/ec2driver.py index c7c7929..2c086cd 100644 --- a/ec2driver.py +++ b/ec2driver.py @@ -202,10 +202,6 @@ class EC2Driver(driver.ComputeDriver): self._wait_for_image_state(image, "available") #TODO we need to fix the queing issue in the images - def live_snapshot(self, context, instance, name, update_task_state): - #We assume that live_snapshot and snapshot does the same thing. - self.snapshot(context, instance, name, update_task_state) - def reboot(self, context, instance, network_info, reboot_type, block_device_info=None, bad_volumes_callback=None): diff --git a/tests/test_ec2driver.py b/tests/test_ec2driver.py index 19ef0ba..4a8fa93 100644 --- a/tests/test_ec2driver.py +++ b/tests/test_ec2driver.py @@ -35,7 +35,7 @@ class EC2DriverTest(unittest.TestCase): ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[self.server.metadata['ec2_id']], filters=None, dry_run=False, max_results=None) - self.assertEqual(len(ec2_instance), 1) + self.assertEqual(ec2_instance[0].id, self.server.metadata['ec2_id']) def test_destroy(self): instance = self.spawn_ec2_instance() @@ -118,7 +118,7 @@ class EC2DriverTest(unittest.TestCase): ec2_instance = self.ec2_conn.get_only_instances(instance_ids=[self.server.metadata['ec2_id']], filters=None, dry_run=False, max_results=None)[0] self.assertEqual(ec2_instance.state, "running") - + def tearDown(self): if self.server is not None: print "Cleanup: Destroying the instance used for testing"