[PATCH conductor] Fixed rspec tests

jprovazn at redhat.com jprovazn at redhat.com
Thu Sep 6 18:59:51 UTC 2012


From: Jan Provaznik <jprovazn at redhat.com>

This patch fixes iwhd tests which were failing if iwhd was down
(introduced my older patch 2628b0019825eae76439e05e1b000015f50b7b13)
---
 src/spec/controllers/pool_families_controller_spec.rb     | 1 +
 src/spec/controllers/provider_accounts_controller_spec.rb | 2 ++
 src/spec/models/provider_account_spec.rb                  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/src/spec/controllers/pool_families_controller_spec.rb b/src/spec/controllers/pool_families_controller_spec.rb
index 44b2bea..9cc1079 100644
--- a/src/spec/controllers/pool_families_controller_spec.rb
+++ b/src/spec/controllers/pool_families_controller_spec.rb
@@ -207,6 +207,7 @@ describe PoolFamiliesController do
 
       it "delete an existing pool family" do
         @pool_family = FactoryGirl.create :pool_family
+        PoolFamily.any_instance.stub(:images).and_return([])
         get :destroy, :id => @pool_family.id
 
         response.status.should be_eql(200)
diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb b/src/spec/controllers/provider_accounts_controller_spec.rb
index dc5e2dd..d7ad155 100644
--- a/src/spec/controllers/provider_accounts_controller_spec.rb
+++ b/src/spec/controllers/provider_accounts_controller_spec.rb
@@ -71,6 +71,7 @@ describe ProviderAccountsController do
 
     it "should allow users with account modify permission to delete a cloud account" do
       mock_warden(@admin)
+      ProviderAccount.any_instance.stub(:provider_images).and_return([])
       lambda do
         post :multi_destroy, :provider_id => @provider_account.provider_id, :accounts_selected => [@provider_account.id]
       end.should change(ProviderAccount, :count).by(-1)
@@ -224,6 +225,7 @@ describe ProviderAccountsController do
 
           it "when requested provider account exists" do
             ProviderAccount.stub(:find).and_return(@provider_account)
+            ProviderAccount.any_instance.stub(:provider_images).and_return([])
             get :destroy, :id => @provider_account.id
             response.status.should be_eql(200)
             response.should have_content_type("application/xml")
diff --git a/src/spec/models/provider_account_spec.rb b/src/spec/models/provider_account_spec.rb
index 5a49146..81b8286 100644
--- a/src/spec/models/provider_account_spec.rb
+++ b/src/spec/models/provider_account_spec.rb
@@ -24,6 +24,7 @@ describe ProviderAccount do
 
   it "should not be destroyable if it has instance with status other than stopped" do
     @provider_account.instances << Instance.new
+    @provider_account.stub(:provider_images).and_return([])
     lambda {@provider_account.destroy}.should
       raise_error(Aeolus::Conductor::Base::NotDestroyable)
     @provider_account.instances.each { |i| i.state = "stopped" }
@@ -35,6 +36,7 @@ describe ProviderAccount do
   end
 
   it "should be destroyable if it has a config server" do
+    @provider_account.stub(:provider_images).and_return([])
     @provider_account.destroy.equal?(@provider_account).should be_true
     @provider_account.should be_frozen
   end
-- 
1.7.11.2




More information about the aeolus-devel mailing list