search for: test_success_message_from_single_vm

...vm_service_test.rb index 7bd00ad..45b882b 100644 --- a/src/test/unit/vm_service_test.rb +++ b/src/test/unit/vm_service_test.rb @@ -84,7 +84,7 @@ class VmServiceTest < ActiveSupport::TestCase # (should be the same message if one or more, so we have one test for # each of those cases) def test_success_message_from_single_vm - assert_equal("shutdown_vm successful.", + assert_equal("shutdown_vm submitted.", svc_vm_actions(vms(:production_mysqld_vm).id, 'shutdown_vm', nil)) end @@ -92,7 +92,7 @@ class VmServiceTest < ActiveSupport::TestCase # (should be the same message...

...tion_mysqld_vm).id, + vms(:production_ftpd_vm).id], 'shutdown_vm', nil) + end + end + + # Ensure we receive the expected success message if all actions succeed + # (should be the same message if one or more, so we have one test for + # each of those cases) + def test_success_message_from_single_vm + assert_equal("shutdown_vm successful.", + svc_vm_actions(vms(:production_mysqld_vm).id, 'shutdown_vm', nil)) + end + + # Ensure we receive the expected success message if all actions succeed + # (should be the same message if one or more, so we have one test for + #...

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.

This is a resend of the 2-patch series from a week or so ago, needed to be rebased due to some commits on next

The following two patches should be applied in the order: * [PATCH server] Add svc_vm_actions method to VmService. * [PATCH server] Cloud UI layer to initiate actions on vms. The service layer patch should work fine on its own (and not break anything), but cloud patch relies on service being there.