openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

Initial rubocop support for ChefSpec tests.

Browse Source 
Per the mailing list thread, introducing Rubocop as a replacement for Tailor.
Assuming Jenkins likes this, more pedantic patches will follow to make Rubocop
happy. So far this is just spacing issues and adding UTF-8 headers, but more
work will need to be done to remove all of the changes for the .rubocop-todo.yml

Addresses: blueprint rubocop-for-block-storage
Change-Id: Ibb11739e452016c101995a371d031faeeb7e7683
This commit is contained in:
Matt Ray
2014-01-08 14:15:48 -06:00
parent 018d125a51
commit 230b2ed90e
20 changed files with 130 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spec/spec_helper.rb
View File

@@ -1,3 +1,7 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-block-storage
require "chefspec"
require "chef/application"
require_relative "support/matcher"
@@ -20,20 +24,20 @@ require_relative "support/matcher"
}
def block_storage_stubs
::Chef::Recipe.any_instance.stub(:rabbit_servers).
and_return "1.1.1.1:5672,2.2.2.2:5672"
::Chef::Recipe.any_instance.stub(:secret).
with("secrets", "openstack_identity_bootstrap_token").
and_return "bootstrap-token"
::Chef::Recipe.any_instance.stub(:db_password).and_return String.new
::Chef::Recipe.any_instance.stub(:user_password).and_return String.new
::Chef::Recipe.any_instance.stub(:user_password).
with("guest").
and_return "rabbit-pass"
::Chef::Recipe.any_instance.stub(:service_password).and_return String.new
::Chef::Recipe.any_instance.stub(:service_password).
with("openstack-block-storage").
and_return "cinder-pass"
::Chef::Recipe.any_instance.stub(:rabbit_servers)
.and_return "1.1.1.1:5672,2.2.2.2:5672"
::Chef::Recipe.any_instance.stub(:secret)
.with("secrets", "openstack_identity_bootstrap_token")
.and_return "bootstrap-token"
::Chef::Recipe.any_instance.stub(:db_password).and_return ''
::Chef::Recipe.any_instance.stub(:user_password).and_return ''
::Chef::Recipe.any_instance.stub(:user_password)
.with("guest")
.and_return "rabbit-pass"
::Chef::Recipe.any_instance.stub(:service_password).and_return ''
::Chef::Recipe.any_instance.stub(:service_password)
.with("openstack-block-storage")
.and_return "cinder-pass"
::Chef::Application.stub(:fatal!)
end
@@ -43,7 +47,7 @@ def expect_runs_openstack_common_logging_recipe
end
end
def expect_creates_cinder_conf service, user, group, action=:restart
def expect_creates_cinder_conf(service, user, group, action = :restart)
describe "cinder.conf" do
before do
@file = @chef_run.template "/etc/cinder/cinder.conf"
@@ -64,7 +68,7 @@ def expect_creates_cinder_conf service, user, group, action=:restart
end
end
def expect_creates_policy_json service, user, group, action=:restart
def expect_creates_policy_json(service, user, group, action = :restart)
describe "policy.json" do
before do
@file = @chef_run.template "/etc/cinder/policy.json"