stackforge/cookbook-pacemaker
Code Issues Proposed changes

don't hardcode keystone in test code

Browse Source
This commit is contained in:
Adam Spiers
2014-01-23 16:22:09 +00:00
parent 8c6a26da74
commit 20b151e7ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spec/helpers/keystone_config.rb
View File

@@ -6,6 +6,7 @@ module Chef::RSpec
extend Chef::Libraries::Pacemaker::CIBObjects extend Chef::Libraries::Pacemaker::CIBObjects
RA = { RA = {
:name => "keystone",
:agent => "ocf:openstack:keystone", :agent => "ocf:openstack:keystone",
:params => [ :params => [
[ "os_password", "adminpw" ], [ "os_password", "adminpw" ],

7
spec/providers/primitive_spec.rb
View File

@@ -12,9 +12,8 @@ describe "Chef::Provider::PacemakerPrimitive" do
@node = @chef_run.node @node = @chef_run.node
@run_context = @chef_run.run_context @run_context = @chef_run.run_context
@resource = Chef::Resource::PacemakerPrimitive.new("keystone", @run_context)
ra = Chef::RSpec::Pacemaker::Config::RA ra = Chef::RSpec::Pacemaker::Config::RA
@resource = Chef::Resource::PacemakerPrimitive.new(ra[:name], @run_context)
@resource.agent ra[:agent] @resource.agent ra[:agent]
@resource.params Hash[ra[:params]] @resource.params Hash[ra[:params]]
@resource.meta Hash[ra[:meta]] @resource.meta Hash[ra[:meta]]
@@ -35,7 +34,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
# and later used to see whether to create or modify. # and later used to see whether to create or modify.
expect(provider).to receive(:get_cib_object_definition).and_return(ra[:config]) expect(provider).to receive(:get_cib_object_definition).and_return(ra[:config])
configure_cmd_prefix = "crm_resource --resource keystone" configure_cmd_prefix = "crm_resource --resource #{ra[:name]}"
expected_configure_cmd_args = [ expected_configure_cmd_args = [
%'--set-parameter "os_password" --parameter-value "newpasswd"', %'--set-parameter "os_password" --parameter-value "newpasswd"',
%'--delete-parameter "os_tenant_name"', %'--delete-parameter "os_tenant_name"',
@@ -64,7 +63,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
provider.run_action :create provider.run_action :create
cmd = "crm configure primitive keystone #{ra[:agent]}" + \ cmd = "crm configure primitive #{ra[:name]} #{ra[:agent]}" + \
ra[:params_string] + ra[:meta_string] + ra[:op_string] ra[:params_string] + ra[:meta_string] + ra[:op_string]
expect(@chef_run).to run_execute(cmd) expect(@chef_run).to run_execute(cmd)