Scott Seago
2009-Jul-01 17:08 UTC
[Ovirt-devel] [PATCH server] fixed expected status messages that were failing unit/functional tests.
--- .../functional/cloud/instance_controller_test.rb | 2 +- src/test/unit/vm_service_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/functional/cloud/instance_controller_test.rb b/src/test/functional/cloud/instance_controller_test.rb index 71d132b..0d713d4 100644 --- a/src/test/functional/cloud/instance_controller_test.rb +++ b/src/test/functional/cloud/instance_controller_test.rb @@ -50,7 +50,7 @@ class Cloud::InstanceControllerTest < ActionController::TestCase def test_add_valid_task post(:index,{:submit_for_list => 'Shutdown', :ids => [vms(:production_mysqld_vm).id]}) - assert_equal('shutdown_vm successful.', flash[:notice]) + assert_equal('shutdown_vm submitted.', flash[:notice]) assert_redirected_to :action => :index, :ids => vms(:production_mysqld_vm).id end diff --git a/src/test/unit/vm_service_test.rb b/src/test/unit/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 if one or more, so we have one test for # each of those cases) def test_success_message_for_multiple_vms - assert_equal("shutdown_vm successful.", + assert_equal("shutdown_vm submitted.", svc_vm_actions([vms(:production_postgresql_vm).id, vms(:production_mysqld_vm).id, vms(:foobar_prod1_vm).id], 'shutdown_vm', nil)) @@ -111,7 +111,7 @@ class VmServiceTest < ActiveSupport::TestCase # each of those cases) def test_success_message_from_single_vm_with_less_privileged_user set_login_user('testuser') - assert_equal("shutdown_vm successful.", + assert_equal("shutdown_vm submitted.", svc_vm_actions(vms(:corp_com_qa_postgres_vm).id, 'shutdown_vm', nil)) end -- 1.6.0.6