[test] fixed agent validation in tests

test/factories.rb

@@ -12,7 +12,6 @@ def private_key
 FactoryGirl.define do
 
   sequence(:uuid) { |n| "uuid-#{n}" }
-  sequence(:pubkey) { |n|  }
   sequence(:username) { |n| "chetan#{n}" }
   sequence(:email_id) { |n| "test#{n}@fw2.net" }
   sequence(:tenant_name) { |n| "foo.org #{n}" }

test/setup/base.rb

@@ -41,6 +41,12 @@ def create_bundle(path)
         bundle
       end
 
+      def create_agent_without_validation
+        agent = FactoryGirl.build(:agent)
+        agent.save(:validate => false)
+        agent
+      end
+
     end
 
     module Models

test/setup/base_controller.rb

@@ -53,6 +53,12 @@ def sign_with_agent
       ApiAuth.sign!(@request, @agent.access_key, @agent.secret_key)
     end
 
+    def create_agent_without_validation
+      agent = FactoryGirl.build(:agent)
+      agent.save(:validate => false)
+      agent
+    end
+
   end
 end
 

test/unit/controllers/rest/models/checks_controller_test.rb

@@ -49,7 +49,7 @@ def test_add_check_with_empty_args
       end
 
       def test_add_check_with_diff_agent
-        agent2 = FactoryGirl.create(:agent)
+        agent2 = create_agent_without_validation
         args = {:host_id => @agent.host.id, :command_id => @command.id, :runhost_id => agent2.host.id}
         post :create, args
         assert_response 200

test/unit/controllers/rest/models/hosts_controller_test.rb

@@ -16,7 +16,7 @@ def test_index
     sign_with_agent
 
     # add another host to make sure we get both back
-    h = FactoryGirl.create(:agent).host
+    h = create_agent_without_validation.host
     h.org_id = @host.org.id
     h.save!
 

test/unit/models/host_test.rb

@@ -92,7 +92,7 @@ def test_search_by_metadata
     host.add_metadata("foo", "bar")
 
     # create an extra agent/host
-    FactoryGirl.create(:agent).host.tap { |h| h.org = host.org; h.save }
+    create_agent_without_validation.host.tap { |h| h.org = host.org; h.save }
 
     hosts = Host.search("foo=bar", user)
     assert_equal 1, hosts.size
@@ -134,7 +134,7 @@ def test_search_inactive
 
   def test_for_user
     h = FactoryGirl.create(:agent).host
-    h2 = FactoryGirl.create(:agent).host
+    h2 = create_agent_without_validation.host
     u = FactoryGirl.create(:user)
     u.org = h.org
     u.save

test/unit/modules/monitoring_test.rb

@@ -61,13 +61,11 @@ def test_update_check_config
       }.
         to_return(:status => 200, :body => cmd_res_json())
 
-    check = FactoryGirl.create(:check)
-
     Provisioning.any_instance.expects(:provision).once.with { |agent, cmd|
-      agent == check.agent and cmd.kind_of?(Array) and cmd.size == 1 and cmd.first.bundle == check.command.bundle.path
+      agent == @check.agent and cmd.kind_of?(Array) and cmd.size == 1 and cmd.first.bundle == @check.command.bundle.path
     }
 
-    ret = Bixby::Monitoring.new.update_check_config(check.agent)
+    ret = Bixby::Monitoring.new.update_check_config(@check.agent)
 
     assert_requested(stub)
     assert_kind_of CommandResponse, ret