foreman_discovery 5.0.0 → 5.0.1

data/test/functional/api/v2/discovered_hosts_controller_test.rb

@@ -29,6 +29,14 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
                        :name => 'discovery_reboot',
                        :value => true,
                        :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_hostname',
+                       :value => 'discovery_bootif',
+                       :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_prefix',
+                       :value => 'mac',
+                       :category => 'Setting::Discovered')
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.stubs(:reboot).returns(true)
   end
 

data/test/functional/api/v2/discovery_rules_controller_test.rb

@@ -4,6 +4,15 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
 
   setup do
     User.current = User.find_by_login "admin"
+
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_hostname',
+                       :value => 'discovery_bootif',
+                       :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_prefix',
+                       :value => 'mac',
+                       :category => 'Setting::Discovered')
   end
 
   test "should get index" do

data/test/functional/discovered_hosts_controller_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'test_helper_discovery'
 
 class DiscoveredHostsControllerTest < ActionController::TestCase
   setup :initialize_host
@@ -18,11 +19,19 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
                        :name => 'discovery_reboot',
                        :value => true,
                        :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_hostname',
+                       :value => 'discovery_bootif',
+                       :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_prefix',
+                       :value => 'mac',
+                       :category => 'Setting::Discovered')
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.stubs(:reboot).returns(true)
   end
 
   def test_index
-    get :index, {}, set_session_user
+    get :index, {}, set_session_user_default_reader
     assert_response :success
   end
 
@@ -33,14 +42,14 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
                        :category => 'Setting::Discovered')
     facts = @facts.merge({"bios_vendor" => "QEMU"})
     Host::Discovered.import_host_and_facts(facts).first
-    get :index, {}, set_session_user
+    get :index, {}, set_session_user_default_reader
     assert_select "td", /QEMU/
     assert_response :success
   end
 
   def test_edit_form_elements
     host = Host::Discovered.import_host_and_facts(@facts).first
-    get :edit, {:id => host.id}, set_session_user
+    get :edit, {:id => host.id}, set_session_user_default_manager
     assert_select "select" do |elements|
       elements.each do |element|
         assert_match(/^host_/, element.attributes['id'])
@@ -51,9 +60,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_edit_form_attributes
     host = Host::Discovered.import_host_and_facts(@facts).first
-    Host.transaction do
-      get :edit, {:id => host.id}, set_session_user
-    end
+    get :edit, {:id => host.id}, set_session_user_default_reader
     assert_not_nil host.cpu_count
   end
 
@@ -67,7 +74,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = Host::Discovered.import_host_and_facts(@facts).first
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true)
-    post "reboot", { :id => host.id }, set_session_user
+    post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
     assert_nil flash[:error]
     assert_equal "Rebooting host #{host.name}", flash[:notice]
@@ -80,7 +87,9 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     Host::Discovered::any_instance.stubs(:proxied?).returns(false)
     Host::Discovered::any_instance.stubs(:proxy_url).returns("http://1.2.3.4:8443")
     ::ForemanDiscovery::NodeAPI::PowerLegacyDirectService.any_instance.expects(:reboot).returns(true)
-    post "reboot", { :id => host.id }, set_session_user
+    ActiveSupport::Deprecation.silence do
+      post "reboot", { :id => host.id }, set_session_user
+    end
     assert_redirected_to discovered_hosts_url
     assert_nil flash[:error]
     assert_equal "Rebooting host #{host.name}", flash[:notice]
@@ -90,7 +99,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = Host::Discovered.import_host_and_facts(@facts).first
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
-    post "reboot", { :id => host.id }, set_session_user
+    post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
     assert_equal "Failed to reboot host #{host.name}", flash[:error]
   end
@@ -99,7 +108,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = Host::Discovered.import_host_and_facts(@facts).first
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
-    post "reboot", { :id => host.id }, set_session_user
+    post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
     assert_match(/ERF50-4973/, flash[:error])
   end
@@ -109,7 +118,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     facts = @facts.merge({"somefact" => "abc"})
     host = Host::Discovered.import_host_and_facts(facts).first
     FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostgroup => hostgroups(:common))
-    post :auto_provision, { :id => host.id }, set_session_user
+    post :auto_provision, { :id => host.id }, set_session_user_default_manager
     assert_response :redirect
     assert_nil flash[:error]
   end
@@ -118,7 +127,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
     host = Host::Discovered.import_host_and_facts(facts).first
-    post :auto_provision, { :id => host.id }, set_session_user
+    post :auto_provision, { :id => host.id }, set_session_user_default_manager
     assert_response :redirect
     assert_nil flash[:error]
   end
@@ -128,7 +137,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     facts = @facts.merge({"somefact" => "abc"})
     Host::Discovered.import_host_and_facts(facts).first
     FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostgroup => hostgroups(:common))
-    post :auto_provision_all, {}, set_session_user
+    post :auto_provision_all, {}, set_session_user_default_manager
     assert_response :redirect
     assert_nil flash[:error]
   end
@@ -138,7 +147,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     facts = @facts.merge({"somefact" => "abc"})
     Host::Discovered.import_host_and_facts(facts).first
     FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostgroup => hostgroups(:common))
-    post :auto_provision_all, {}, set_session_user
+    post :auto_provision_all, {}, set_session_user_default_manager
     assert_response :redirect
     assert_nil flash[:error]
   end
@@ -147,7 +156,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = Host::Discovered.import_host_and_facts(@facts).first
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true)
-    post "reboot", { :id => host.id }, set_session_user
+    post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
     assert_equal "Rebooting host #{host.name}", flash[:notice]
   end
@@ -156,7 +165,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = Host::Discovered.import_host_and_facts(@facts).first
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
-    post "reboot_all", { }, set_session_user
+    post "reboot_all", { }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
     assert_equal "Errors during reboot: #{host.name}: failed to reboot", flash[:error]
   end
@@ -165,7 +174,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = Host::Discovered.import_host_and_facts(@facts).first
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
-    post "reboot_all", { }, set_session_user
+    post "reboot_all", { }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
     assert_match(/ERF50-4973/, flash[:error])
   end

data/test/functional/discovery_rules_controller_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'test_helper_discovery'
 
 class DiscoveryRulesControllerTest < ActionController::TestCase
   setup :initialize_host
@@ -8,14 +9,14 @@ class DiscoveryRulesControllerTest < ActionController::TestCase
     assert_tag :tag => 'a', :attributes => {:href => '/discovery_rules'}
   end
 
-  test "should get index" do
-    get :index, {}, set_session_user
+  test "reader role should get index" do
+    get :index, {}, set_session_user_default_reader
     assert_response :success
     assert_not_nil assigns(:discovery_rules)
   end
 
   test "should get new" do
-    get :new, {}, set_session_user
+    get :new, {}, set_session_user_default_manager
     assert_response :success
   end
 
@@ -26,7 +27,7 @@ class DiscoveryRulesControllerTest < ActionController::TestCase
         :search => "bar",
         :hostgroup_id => 1,
         :hostname => "",
-        :priority => 1}}, set_session_user
+        :priority => 1}}, set_session_user_default_manager
     end
 
     assert_redirected_to discovery_rules_path
@@ -34,25 +35,25 @@ class DiscoveryRulesControllerTest < ActionController::TestCase
 
   test "should get edit" do
     rule = FactoryGirl.create(:discovery_rule)
-    get :edit, {:id => rule.to_param}, set_session_user
+    get :edit, {:id => rule.to_param}, set_session_user_default_manager
     assert_response :success
   end
 
   test "should update discovery rule" do
     rule = FactoryGirl.create(:discovery_rule)
-    put :update, {:id => rule.to_param, :discovery_rule => {}}, set_session_user
+    put :update, {:id => rule.to_param, :discovery_rule => {}}, set_session_user_default_manager
     assert_redirected_to discovery_rules_path
   end
 
   test "should destroy discovery rule" do
     rule = FactoryGirl.create(:discovery_rule)
     assert_difference('DiscoveryRule.count', -1) do
-      delete :destroy, {:id => rule.to_param}, set_session_user
+      delete :destroy, {:id => rule.to_param}, set_session_user_default_manager
     end
 
     assert_redirected_to discovery_rules_path
   end
-  
+
   private
 
   def initialize_host

data/test/test_helper.rb

@@ -21,7 +21,3 @@ class ActiveSupport::TestCase
 
   set_fixture_class({ :hosts => Host::Base })
 end
-
-def set_session_user
-  SETTINGS[:login] ? {:user => User.admin.id, :expires_at => 5.minutes.from_now} : {}
-end

data/test/test_helper_discovery.rb

@@ -0,0 +1,24 @@
+def set_session_user_with_perms perms
+  perms = perms.collect{|p| Permission.find_by_name(p) || Permission.create(:name => p) }
+  perms.each do |p|
+    p.resource_type = 'Host' if p.name =~ /discovered_hosts$/
+    p.resource_type = 'DiscoveryRule' if p.name =~ /discovery_rules$/
+    p.save!
+  end
+  role = FactoryGirl.create :role
+  perms.each do |perm|
+    FactoryGirl.create(:filter, :role => role, :permissions => [perm])
+  end
+  user = FactoryGirl.create :user, :with_mail, :admin => false
+  user.roles << role
+  user.save!
+  SETTINGS[:login] ? {:user => user, :expires_at => 5.minutes.from_now} : {}
+end
+
+def set_session_user_default_reader
+  set_session_user_with_perms Foreman::Plugin.find('foreman_discovery').default_roles['Discovery Reader']
+end
+
+def set_session_user_default_manager
+  set_session_user_with_perms Foreman::Plugin.find('foreman_discovery').default_roles['Discovery Manager']
+end

data/test/unit/discovered_extensions_test.rb

@@ -11,6 +11,15 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
       "macaddress_eth0"  => "AA:BB:CC:DD:EE:FF",
       "discovery_bootif" => "AA:BB:CC:DD:EE:FF",
     }
+
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_hostname',
+                       :value => 'discovery_bootif',
+                       :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_prefix',
+                       :value => 'mac',
+                       :category => 'Setting::Discovered')
   end
 
   test "no rule is found for empty rule set" do
@@ -89,6 +98,28 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
     assert_equal host.discovery_rule_id, r1.id
   end
 
+  test "auto provisioning fails for rule without a hostgroup" do
+    facts = @facts.merge({"somefact" => "abc"})
+    host = Host::Discovered.import_host_and_facts(facts).first
+    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+                            :organizations => [host.organization], :locations => [host.location])
+    r1.hostgroup = nil
+    exception = assert_raises(::Foreman::Exception) do
+      perform_auto_provision host, r1
+    end
+    assert_match /No hostgroup associated with rule/, exception.message
+  end
+
+  test "existing rule revent from hostgroup deletion" do
+    facts = @facts.merge({"somefact" => "abc"})
+    host = Host::Discovered.import_host_and_facts(facts).first
+    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+                            :organizations => [host.organization], :locations => [host.location])
+    assert_raises(ActiveRecord::RecordNotDestroyed) do
+      r1.hostgroup.destroy!
+    end
+  end
+
   test "rules with incorrect syntax are skipped" do
     facts = @facts.merge({"somefact" => "abc"})
     host = Host::Discovered.import_host_and_facts(facts).first

data/test/unit/discovered_mailer_test.rb

@@ -0,0 +1,44 @@
+require 'test_plugin_helper'
+
+class DiscoveredMailerTest < ActiveSupport::TestCase
+  setup do
+    @user = User.current = users :admin
+
+    FactoryGirl.create(:mail_notification,
+                       :name => :discovered_summary,
+                       :description => N_('A summary of discovered hosts'),
+                       :mailer => 'DiscoveredMailer',
+                       :method => 'discovered_summary',
+                       :subscription_type => 'report',
+    )
+
+    @user.mail_notifications << MailNotification[:discovered_summary]
+
+    ActionMailer::Base.deliveries = []
+    @user.user_mail_notifications.first.deliver
+    @email = ActionMailer::Base.deliveries.first
+  end
+
+  test 'discovery mailer should deliver summary' do
+    assert @email.to.include?("admin@someware.com")
+  end
+
+  test 'discovery mailer should contain body' do
+    refute @email.body.nil?
+  end
+
+  test 'discovery mailer should have a correct subject' do
+    refute @email.subject.empty?
+    assert @email.subject.include? Setting[:email_subject_prefix].first
+  end
+
+  test 'discovery mailer sends Foreman URL in body' do
+    assert @email.body.parts.first.body.raw_source.include? Setting[:foreman_url]
+  end
+
+  test 'discovery mailer sends both html and text emails' do
+    assert_equal(2, @email.body.parts.size)
+    refute(@email.body.parts.first.body.raw_source.start_with?('<!DOCTYPE')) # text email
+    assert(@email.body.parts.last.body.raw_source.start_with?('<!DOCTYPE')) # html email
+  end
+end

data/test/unit/discovery_attribute_set_test.rb

@@ -1,6 +1,18 @@
 require 'test_helper'
 
 class DiscoveryAttributeSetTest < ActiveSupport::TestCase
+
+  setup do
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_hostname',
+                       :value => 'discovery_bootif',
+                       :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_prefix',
+                       :value => 'mac',
+                       :category => 'Setting::Discovered')
+  end
+
   test "can search discovered hosts by cpu" do
     raw = parse_json_fixture('/facts.json')
     host = Host::Discovered.import_host_and_facts(raw['facts']).first

data/test/unit/discovery_rule_test.rb

@@ -35,6 +35,26 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
     assert_equal "can't be blank", rule.errors[:hostgroup_id].first
   end
 
+  test "should not be able to create a rule with priority bigger than 2^31" do
+    rule = DiscoveryRule.new :name => "myrule",
+      :search => "cpu_count > 1",
+      :priority => 2**31 + 1,
+      :hostgroup_id => @hostgroup.id,
+      :organization_ids => [@hg_org.id]
+    refute_valid rule
+    assert_equal "must be less than 2147483648", rule.errors[:priority].first
+  end
+
+  test "should not be able to create a rule with max count bigger than 2^31" do
+    rule = DiscoveryRule.new :name => "myrule",
+      :search => "cpu_count > 1",
+      :max_count => 2**31 + 1,
+      :hostgroup_id => @hostgroup.id,
+      :organization_ids => [@hg_org.id]
+    refute_valid rule
+    assert_equal "must be less than 2147483648", rule.errors[:max_count].first
+  end
+
   test "should enforce hostgroup organizations" do
     skip unless SETTINGS[:organizations_enabled]
     rule = DiscoveryRule.new :name => "myrule",

data/test/unit/{puppet_fact_parser_extensions_test.rb → fact_parser_test.rb}

@@ -1,20 +1,6 @@
 require 'test_helper'
 
-class PuppetFactParserStub
-  attr_reader :interfaces, :facts
-
-  def initialize(interfaces, facts)
-    @interfaces = interfaces
-    @facts = facts
-  end
-
-  def suggested_primary_interface(_); end
-  def parse_interfaces?; end
-
-  include PuppetFactParserExtensions
-end
-
-class PuppetFactParserTest < ActiveSupport::TestCase
+class FactParserTest < ActiveSupport::TestCase
   setup do
     interfaces = {
       'eth0' => {'macaddress' => 'aa:bb:cc:dd:ee:f1', 'ipaddress' => '192.168.1.1'},
@@ -32,7 +18,8 @@ class PuppetFactParserTest < ActiveSupport::TestCase
       :macaddress => 'aa:bb:cc:dd:ee:f2',
       :discovery_bootif => 'aa:bb:cc:dd:ee:f3'
     }.with_indifferent_access
-    @parser = PuppetFactParserStub.new(interfaces, facts)
+    @parser = ::ForemanDiscovery::FactParser.new(facts)
+    @parser.stubs(:interfaces).returns(interfaces)
     @host = Host::Discovered.new(:name => 'dummy')
   end
 

data/test/unit/host_discovered_test.rb

@@ -6,6 +6,10 @@ class HostDiscoveredTest < ActiveSupport::TestCase
                        :name => 'discovery_fact',
                        :value => 'discovery_bootif',
                        :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_hostname',
+                       :value => 'discovery_bootif',
+                       :category => 'Setting::Discovered')
     FactoryGirl.create(:setting,
                        :name => 'discovery_prefix',
                        :value => 'mac',
@@ -65,9 +69,19 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert host.refresh_facts
   end
 
+  test "should create discovered host with hostname if a fact was supplied" do
+    raw = parse_json_fixture('/facts.json')
+    Setting[:discovery_hostname] = 'somefact'
+    facts = raw['facts'].merge({"somefact" => "somename"})
+    host = Host::Discovered.import_host_and_facts(facts).first
+    assert_equal 'macsomename', host.name
+    refute_equal 'e4:1f:13:cc:36:5a', host.mac
+  end
+
   test "should create discovered host with fact_name as a name if it is a valid mac" do
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_fact] = 'somefact'
+    Setting[:discovery_hostname] = 'somefact'
     facts = raw['facts'].merge({"somefact" => "E4:1F:13:CC:36:5A"})
     host = Host::Discovered.import_host_and_facts(facts).first
     assert_equal 'mace41f13cc365a', host.name
@@ -90,25 +104,31 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal 'teste41f13cc3658', host.name
   end
 
-  test "should not name discovered host with prefix that starts with a number, fallback to 'mac'" do
+  test "should create discovered host without prefix" do
     raw = parse_json_fixture('/facts.json')
-    Setting[:discovery_prefix] = '123'
+    Setting[:discovery_prefix] = ''
     host = Host::Discovered.import_host_and_facts(raw['facts']).first
-    assert host.name.start_with?('mac')
+    assert_equal 'e41f13cc3658',host.name
   end
 
-  test "should not name discovered host with prefix that starts with a special character, fallback to 'mac'" do
+  test "should raise when hostname fact cannot be found" do
     raw = parse_json_fixture('/facts.json')
-    Setting[:discovery_prefix] = '^abc'
-    host = Host::Discovered.import_host_and_facts(raw['facts']).first
-    assert host.name.start_with?('mac')
+    Setting[:discovery_hostname] = 'macaddress_foo'
+    exception = assert_raises(::Foreman::Exception) do
+      Host::Discovered.import_host_and_facts(raw['facts'])
+    end
+    assert_match(/Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting:/, exception.message)
   end
 
-  test "should not name discovered host with prefix that starts with a _, fallback to 'mac'" do
+  test "should raise when hostname cannot be computed due to normlization and no prefix" do
     raw = parse_json_fixture('/facts.json')
-    Setting[:discovery_prefix] = '_abc'
-    host = Host::Discovered.import_host_and_facts(raw['facts']).first
-    assert host.name.start_with?('mac')
+    raw['facts']['invalidhostnamefact'] = '...'
+    Setting[:discovery_hostname] = 'invalidhostnamefact'
+    Setting[:discovery_prefix] = ''
+    exception = assert_raises(::Foreman::Exception) do
+      Host::Discovered.import_host_and_facts(raw['facts'])
+    end
+    assert_match(/Invalid hostname: Could not normalize the hostname/, exception.message)
   end
 
   test 'discovered host can be searched in multiple taxonomies' do
@@ -148,6 +168,31 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert Token.where(:host_id => h.id).empty?
   end
 
+  test "normalization of MAC into a discovered host hostname" do
+    assert_equal Host::Discovered.normalize_string_for_hostname("90:B1:1C:54:D5:82"),"90b11c54d582"
+  end
+
+  test "normalization of a string containing multiple non-alphabetical characters" do
+    assert_equal Host::Discovered.normalize_string_for_hostname(".-_Test::Host.name_-."),"testhostname"
+  end
+
+  test "normalization of a valid hostname" do
+    assert_equal Host::Discovered.normalize_string_for_hostname("testhostname"),"testhostname"
+  end
+
+  test "empty string after hostname normalization should raise an error" do
+    exception = assert_raises(::Foreman::Exception) do
+      Host::Discovered.normalize_string_for_hostname(".-_")
+    end
+    assert_match(/Invalid hostname: Could not normalize the hostname/, exception.message)
+  end
+
+  test "chooshing the first valid fact from array of fact names" do
+    facts = {"custom_hostname" => "testhostname","notmyfact" => "notusedfactvalue"}
+    discovery_hostname_fact_array = ['macaddress','custom_hostname','someotherfact']
+    assert_equal Host::Discovered.return_first_valid_fact(discovery_hostname_fact_array,facts),"testhostname"
+  end
+
   def parse_json_fixture(relative_path)
     return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
   end