summaryrefslogtreecommitdiffstats
path: root/test/puppet/defaults.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-11-08 05:22:24 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-11-08 05:22:24 +0000
commit744ded30a02883dd8ce5fbf2b847f10acb226d6e (patch)
treed962b7b21f3a5d20dafd8e7f862c23a2449c2c9b /test/puppet/defaults.rb
parentdc4d98091a5566be289830839f1d6eb39367b42c (diff)
downloadpuppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.tar.gz
puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.tar.xz
puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.zip
Merging the code over from the oscar branch. I will now be doing all development in the trunk again, except for larger changes, which will still get their own branch. This is a merge of the changes from revision 1826 to revision 1834.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1835 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/puppet/defaults.rb')
-rwxr-xr-xtest/puppet/defaults.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb
index 7ac74eb54..033fb71bc 100755
--- a/test/puppet/defaults.rb
+++ b/test/puppet/defaults.rb
@@ -15,7 +15,7 @@ class TestPuppetDefaults < Test::Unit::TestCase
@@booleans = %w{rrdgraph noop}
def testVersion
- assert( Puppet.version =~ /^[0-9]+(\.[0-9]+)*$/ )
+ assert( Puppet.version =~ /^[0-9]+(\.[0-9]+)*/, "got invalid version number %s" % Puppet.version )
end
def testStringOrParam