Merge pull request #14725 from isimluk/do-not-run-MiqEventDefinitionS…

…et.seed-twice Do not run MiqEventDefinitionSet.seed twice on every start-up
ManageIQ · Apr 11, 2017 · c995366 · c995366
2 parents 03239d7 + 82a3afd
commit c995366
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/app/models/miq_event_definition.rb b/app/models/miq_event_definition.rb
@@ -117,7 +117,6 @@ def self.add_elements(_vm, xmlNode)
   end
 
   def self.seed
-    MiqEventDefinitionSet.seed
     seed_default_events
     seed_default_definitions
   end

diff --git a/lib/evm_database.rb b/lib/evm_database.rb
@@ -23,6 +23,7 @@ class EvmDatabase
     RssFeed
     MiqWidget
     MiqAction
+    MiqEventDefinitionSet
     MiqEventDefinition
     MiqPolicySet
     ChargebackRateDetailMeasure

diff --git a/spec/models/authentication_spec.rb b/spec/models/authentication_spec.rb
@@ -8,6 +8,7 @@
 
   context "with miq events seeded" do
     before(:each) do
+      MiqEventDefinitionSet.seed
       MiqEventDefinition.seed
     end