- if param_hash[:key_content]
- should contain_exec("Add key: #{param_hash[:key]} from content").with({
- "command" => "/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -",
- "unless" => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'",
- "before" => "File[#{title}.list]"
- })
- should_not contain_exec("/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}").with({
- "unless" => "/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}",
- "before" => "File[#{title}.list]"
- })
-
- else
- should contain_exec("/usr/bin/apt-key adv --keyserver #{param_hash[:key_server]} --recv-keys #{param_hash[:key]}").with({
- "unless" => "/usr/bin/apt-key list | /bin/grep #{param_hash[:key]}",
- "before" => "File[#{title}.list]"
- })
- should_not contain_exec("Add key: #{param_hash[:key]} from content").with({
- "command" => "/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -",
- "unless" => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'",
- "before" => "File[#{title}.list]"
- })
- end
- else
- should_not contain_exec("Add key: #{param_hash[:key]} from content").with({
- "command" => "/bin/echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -",
- "unless" => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'",
- "before" => "File[#{title}.list]"
+ should contain_apt__key("Add key: #{param_hash[:key]} from Apt::Source #{title}").with({
+ "key" => param_hash[:key],
+ "ensure" => :present,
+ "key_server" => param_hash[:key_server],
+ "key_content" => param_hash[:key_content],
+ "key_source" => param_hash[:key_source],
+ "before" => "File[#{title}.list]"