Fixes #22933 - fix functional test case for reboot all hosts #413
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Issues: #22933 |
|
I still see 8 failures here. FYI you need to remove this line because of this change in core: theforeman/foreman#5318 diff --git a/test/integration/discovered_hosts_test.rb b/test/integration/discovered_hosts_test.rb
index edcf4f7..0e47e50 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! |
|
Here is what I see locally atm: |
rabajaj0509
force-pushed
the
reboot-test
branch
5 times, most recently
from
562b508
to
6b0327e
Compare
rabajaj0509
commented
Mar 21, 2018
test/unit/host_discovered_test.rb
Outdated
| @@ -155,7 +155,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase | |||
| 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]) | |||
| ::Nic::Managed.stubs(:where).with(:mac => @facts['discovery_bootif'].downcase, :primary => true).returns([interface]).never | |||
| host = discover_host_from_facts(@facts) | |||
There was a problem hiding this comment.
@lzap not sure if this helps, can you please look into this?
|
@mmoll thanks is there a trick to trigger them other than manually via Jenkins Web UI ? :-D @rahulbajaj0509 still failing lemme look |
|
@rahulbajaj0509 ok so the problem is that the test is clunky, no idea why it regressed but here is better version of doing the same - we want to basically make sure that if there is an existing discovered host, new one is not created. Here is new version much better, also tests NIC and fact: diff --git a/test/unit/host_discovered_test.rb b/test/unit/host_discovered_test.rb
index 5597fe9..89bad06 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]).never
- 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" doFor easy copypaste here it is: Ping me after you rebase so I can quickly test and merge! Thanks. |
rabajaj0509
force-pushed
the
reboot-test
branch
from
6b0327e
to
705761d
Compare
|
Merged, all green locally! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.