stackforge/cookbook-pacemaker
Code Issues Proposed changes

sort RA parameters for deterministic tests

Browse Source
This commit is contained in:
Adam Spiers 2014-01-23 15:05:40 +00:00
parent 7f5a799e02
commit 73a377cc75
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/cib_objects.rb
View File

@ -37,7 +37,7 @@ module Chef::Libraries
def resource_params_string(params)
return "" if ! params or params.empty?
s = " params"
params.each do |key, value|
params.sort.each do |key, value|
s << %' #{key}="#{value}"'
end
s
@ -46,7 +46,7 @@ module Chef::Libraries
def resource_meta_string(meta)
return "" if ! meta or meta.empty?
s = " meta"
meta.each do |key, value|
meta.sort.each do |key, value|
s << %' #{key}="#{value}"'
end
s
@ -55,9 +55,9 @@ module Chef::Libraries
def resource_op_string(ops)
return "" if ! ops or ops.empty?
s = " op"
ops.each do |op, attrs|
ops.sort.each do |op, attrs|
s << " #{op}"
attrs.each do |key, value|
attrs.sort.each do |key, value|
s << %' #{key}="#{value}"'
end
end

6
spec/libraries/cib_objects_spec.rb
View File

@ -113,7 +113,7 @@ describe Chef::Libraries::Pacemaker::CIBObjects do
"foo" => "bar",
"baz" => "qux",
}
expect(resource_params_string(params)).to eq(%' params foo="bar" baz="qux"')
expect(resource_params_string(params)).to eq(%' params baz="qux" foo="bar"')
end
end
@ -131,7 +131,7 @@ describe Chef::Libraries::Pacemaker::CIBObjects do
"foo" => "bar",
"baz" => "qux",
}
expect(resource_meta_string(meta)).to eq(%' meta foo="bar" baz="qux"')
expect(resource_meta_string(meta)).to eq(%' meta baz="qux" foo="bar"')
end
end
@ -151,7 +151,7 @@ describe Chef::Libraries::Pacemaker::CIBObjects do
"baz" => "qux",
}
}
expect(resource_op_string(op)).to eq(%' op monitor foo="bar" baz="qux"')
expect(resource_op_string(op)).to eq(%' op monitor baz="qux" foo="bar"')
end
end