From 705761dd5aa81b246d50aa0c827df387b796dcb4 Mon Sep 17 00:00:00 2001 From: Rahul Bajaj Date: Mon, 19 Mar 2018 14:44:55 +0000 Subject: [PATCH] Fixes #22933 - fix functional/integration test cases --- .../discovered_hosts_controller_test.rb | 21 +++++++++---------- test/integration/discovered_hosts_test.rb | 2 -- test/unit/host_discovered_test.rb | 20 ++++++++++++------ 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/test/functional/discovered_hosts_controller_test.rb b/test/functional/discovered_hosts_controller_test.rb index 096050cb..af50d197 100644 --- a/test/functional/discovered_hosts_controller_test.rb +++ b/test/functional/discovered_hosts_controller_test.rb @@ -103,7 +103,7 @@ def test_edit_form_quick_submit assert managed_host.build assert_redirected_to host_url(managed_host) assert_equal hostgroup.id, managed_host.hostgroup_id - assert_match(/Successfully/, flash[:notice]) + assert_match(/Successfully/, flash[:success]) end end @@ -178,7 +178,7 @@ def test_reboot_success post :reboot, params: { :id => host.id }, session: set_session_user_default_manager assert_redirected_to discovered_hosts_url assert_nil flash[:error] - assert_equal "Rebooting host #{host.name}", flash[:notice] + assert_equal "Rebooting host #{host.name}", flash[:success] end def test_reboot_failure @@ -208,7 +208,7 @@ def test_auto_provision_success post :auto_provision, params: { :id => host.id }, session: set_session_user(User.current) assert_response :redirect assert_nil flash[:error] - assert_match(/^Host macaabbccddeeff.* was provisioned/, flash[:notice]) + assert_match(/^Host macaabbccddeeff.* was provisioned/, flash[:success]) managed_host = Host.find(host.id) assert managed_host.build end @@ -220,7 +220,7 @@ def test_auto_provision_no_rule_success post :auto_provision, params: { :id => host.id }, session: set_session_user(User.current) assert_response :redirect assert_nil flash[:error] - assert_equal "No rule found for host macaabbccddeeff", flash[:notice] + assert_equal "No rule found for host macaabbccddeeff", flash[:success] end def test_auto_provision_all_success @@ -238,7 +238,7 @@ def test_auto_provision_all_success post :auto_provision_all, params: {}, session: set_session_user(User.current) assert_response :redirect assert_nil flash[:error] - assert_equal "Discovered hosts are provisioning now", flash[:notice] + assert_equal "Discovered hosts are provisioning now", flash[:success] end def test_auto_provision_all_no_rule_success @@ -256,18 +256,17 @@ def test_auto_provision_all_no_rule_success post :auto_provision_all, params: {}, session: set_session_user(User.current) assert_response :redirect assert_nil flash[:error] - assert_equal "Discovered hosts are provisioning now", flash[:notice] + assert_equal "Discovered hosts are provisioning now", flash[:success] end def test_reboot_all_success @request.env["HTTP_REFERER"] = discovered_hosts_url host = discover_host_from_facts(@facts) ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true) - post :reboot, params: { :id => host.id }, session: set_session_user_default_manager + post :reboot_all, params: { }, session: set_session_user_default_manager assert_redirected_to discovered_hosts_url - assert_equal "Rebooting host #{host.name}", flash[:notice] assert_nil flash[:error] - assert_equal "Rebooting host macaabbccddeeff", flash[:notice] + assert_equal "Discovered hosts are rebooting now", flash[:success] end def test_reboot_all_failure @@ -277,7 +276,7 @@ def test_reboot_all_failure post :reboot_all, params: { }, session: set_session_user_default_manager assert_redirected_to discovered_hosts_url assert_equal "Errors during reboot: #{host.name}: failed to reboot", flash[:error] - assert_nil flash[:notice] + assert_nil flash[:success] end def test_reboot_all_error @@ -287,7 +286,7 @@ def test_reboot_all_error post :reboot_all, params: { }, session: set_session_user_default_manager assert_redirected_to discovered_hosts_url assert_match(/ERF50-4973/, flash[:error]) - assert_nil flash[:notice] + assert_nil flash[:success] end def test_no_dns_rebuild_if_dns_pending diff --git a/test/integration/discovered_hosts_test.rb b/test/integration/discovered_hosts_test.rb index edcf4f79..0e47e50f 100644 --- a/test/integration/discovered_hosts_test.rb +++ b/test/integration/discovered_hosts_test.rb @@ -5,8 +5,6 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript let(:discovered_host) { FactoryBot.create(:discovered_host, :with_facts) } let(:discovered_hosts) { Host::Discovered.all } - extend Minitest::OptionalRetry - setup do assert discovered_notification_blueprint discovered_host.save! diff --git a/test/unit/host_discovered_test.rb b/test/unit/host_discovered_test.rb index 5f38dae3..89bad066 100644 --- a/test/unit/host_discovered_test.rb +++ b/test/unit/host_discovered_test.rb @@ -152,12 +152,20 @@ class HostDiscoveredTest < ActiveSupport::TestCase assert_equal 'e41f13cc3658',host.name end - test "should refresh existing discovered" do - interface = mock() - interface.stubs(:host).returns(Host.create(:name => "xyz", :type => "Host::Discovered")) - ::Nic::Managed.stubs(:where).with(:mac => @facts['discovery_bootif'].downcase, :primary => true).returns([interface]) - host = discover_host_from_facts(@facts) - assert_equal 'xyz', host.name + test "should refresh facts and NICs of an existing discovered host" do + host1 = discover_host_from_facts(@facts) + assert_equal 'mace41f13cc3658', host1.name + assert_equal 'IBM System x -[7870K4G]-', host1.facts["productname"] + assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count + assert_equal '10.35.27.3', host1.ip + + @facts["ipaddress_eth0"] = "1.2.3.4" + @facts["productname"] = "Dishwasher DW400" + host2 = discover_host_from_facts(@facts) + assert_equal 'mace41f13cc3658', host2.name + assert_equal 'Dishwasher DW400', host2.facts["productname"] + assert_equal '1.2.3.4', host2.ip + assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count end test "should raise when hostname fact cannot be found" do