fixing failing tests

QualiSystems · Jul 21, 2016 · 877fdb9 · 877fdb9
1 parent 89b1d62
commit 877fdb9
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/package/tests/test_aws_shell.py b/package/tests/test_aws_shell.py
@@ -113,29 +113,15 @@ def test_prepare_connectivity_invalid_req(self):
 
         self.assertRaises(ValueError, self.aws_shell_api.prepare_connectivity, self.command_context, req)
 
-    def test_delete_ami(self):
+    def test_delete_instance(self):
         deployed_model = DeployDataHolder({'vmdetails': {'uid': 'id'}})
         remote_resource = Mock()
         remote_resource.fullname = 'my ami name'
         self.command_context.remote_endpoints = [remote_resource]
         self.aws_shell_api.model_parser.convert_app_resource_to_deployed_app = Mock(return_value=deployed_model)
         self.aws_shell_api.delete_ami_operation.delete_instance = Mock(return_value=True)
 
-        self.aws_shell_api.delete_ami(self.command_context)
-
-        self.assertTrue(
-            self.aws_shell_api.delete_ami_operation.delete_instance.called_with(
-                self.aws_shell_api.aws_session_manager.get_ec2_session(), 'id'))
-
-    def test_delete_ami_delete_resource(self):
-        deployed_model = DeployDataHolder({'vmdetails': {'uid': 'id'}})
-        remote_resource = Mock()
-        remote_resource.fullname = 'my ami name'
-        self.command_context.remote_endpoints = [remote_resource]
-        self.aws_shell_api.model_parser.convert_app_resource_to_deployed_app = Mock(return_value=deployed_model)
-        self.aws_shell_api.delete_ami_operation.delete_instance = Mock(return_value=True)
-
-        self.aws_shell_api.delete_ami(self.command_context)
+        self.aws_shell_api.delete_instance(self.command_context)
 
         self.assertTrue(
             self.aws_shell_api.delete_ami_operation.delete_instance.called_with(