make ganglia_validate_clusters output consistently testable

Between Ruby 1.8.7 and 1.9.3+
seattle-biomed · May 16, 2014 · fbbeb0e · fbbeb0e
1 parent 59d378d
commit fbbeb0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/puppet/parser/functions/ganglia_validate_clusters.rb b/lib/puppet/parser/functions/ganglia_validate_clusters.rb
@@ -106,7 +106,7 @@ module Puppet::Parser::Functions
       # any other keys should be rejected
       extras = c.keys - %w{ name address polling_interval }
       if extras.length > 0
-        raise Puppet::ParseError, ("ganglia_validate_clusters(): nested Hash contains unknown keys (#{extras.sort})") 
+        raise Puppet::ParseError, ("ganglia_validate_clusters(): nested Hash contains unknown keys (#{extras.sort.join(' ')})") 
       end
     end
   end

diff --git a/spec/functions/ganglia_validate_clusters_spec.rb b/spec/functions/ganglia_validate_clusters_spec.rb
@@ -78,7 +78,7 @@
   it 'should fail with unknown keys' do
     clusters = [{ 'name' => 'my cluster', 'address' => 'localhost', 'polling_interval' => 10, 'foo' => 1, 'bar' => 2 }]
     expect { subject.call([clusters]) }.
-      to raise_error(Puppet::ParseError, Regexp.new(Regexp.escape('contains unknown keys (["bar", "foo"])')))
+      to raise_error(Puppet::ParseError, /contains unknown keys \(bar foo\)/)
   end
 
   it 'work with reasonable input - simple example' do