[Ovirt-devel] [PATCH server] Fixes broken unit tests for bonding classes and the host browser.

[Darryl L. Pierce]

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb          |    6 ++++++
 src/app/models/bonding_type.rb     |    4 ++++
 src/test/unit/bonding_test.rb      |   10 +++++-----
 src/test/unit/bonding_type_test.rb |    2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..4b6e8a5 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -33,6 +33,12 @@ class Bonding < ActiveRecord::Base
   validates_presence_of :name,
     :message => 'A name is required.'
 
+  validates_presence_of :host_id,
+    :message => 'A host must be specified.'
+
+  validates_presence_of :bonding_type_id,
+    :message => 'A bonding type must be specified.'
+
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
 
diff --git a/src/app/models/bonding_type.rb b/src/app/models/bonding_type.rb
index e0d2193..f844df1 100644
--- a/src/app/models/bonding_type.rb
+++ b/src/app/models/bonding_type.rb
@@ -22,5 +22,9 @@
 #
 class BondingType < ActiveRecord::Base
   validates_presence_of :label
+  validates_uniqueness_of :label,
+    :message => 'Label must be unique'
   validates_presence_of :mode
+  validates_uniqueness_of :mode,
+    :message => 'Mode must be unique'
 end
diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb
index 4bdb079..a2cdef8 100644
--- a/src/test/unit/bonding_test.rb
+++ b/src/test/unit/bonding_test.rb
@@ -28,10 +28,10 @@ class BondingTest < ActiveSupport::TestCase
 
   def setup
     @bonding = Bonding.new(
-      :name           => 'Bonding1',
-      :interface_name => 'bond0',
-      :type_id        => bonding_types(:failover_bonding_type),
-      :host_id        => hosts(:mailservers_managed_node))
+      :name            => 'Bonding1',
+      :interface_name  => 'bond0',
+      :bonding_type_id => bonding_types(:failover_bonding_type),
+      :host_id         => hosts(:mailservers_managed_node))
   end
 
   # Ensures that the name is required.
@@ -53,7 +53,7 @@ class BondingTest < ActiveSupport::TestCase
   # Ensures that the bonding type is required.
   #
   def test_valid_fails_without_type
-    @bonding.type_id = nil
+    @bonding.bonding_type_id = nil
 
     flunk 'Bondings have to have a valid type.' if @bonding.valid?
   end
diff --git a/src/test/unit/bonding_type_test.rb b/src/test/unit/bonding_type_test.rb
index 5f2ccb2..c900002 100644
--- a/src/test/unit/bonding_type_test.rb
+++ b/src/test/unit/bonding_type_test.rb
@@ -29,6 +29,6 @@ class BondingTypeTest < ActiveSupport::TestCase
   def test_modes_must_be_unique
     @bonding_type.mode = BondingType.find(:first).mode
 
-    assert @bonding_type.save == false, 'A bonding type with a duplicate mode should not save.'
+    flunk "Modes must be unique" if @bonding_type.valid?
   end
 end
-- 
1.5.5.1