diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-08-24 15:42:03 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-08-24 15:42:03 -0700 |
| commit | da4a2def42639817c4522fc0162bd691956998da (patch) | |
| tree | 3cb423a7d2a7a803a922b710c661d675d11bf131 /test/lib/puppettest | |
| parent | 0d51dc9be0bc1c785d749b8b352a1e43b1b6e9c6 (diff) | |
| parent | 630ec36089e2224fba99b76d76eaf904af13e4d6 (diff) | |
| download | puppet-da4a2def42639817c4522fc0162bd691956998da.tar.gz puppet-da4a2def42639817c4522fc0162bd691956998da.tar.xz puppet-da4a2def42639817c4522fc0162bd691956998da.zip | |
Merge branch '2.7.x'
Conflicts:
lib/puppet/feature/base.rb
lib/puppet/file_serving/configuration.rb
spec/unit/indirector/ssl_file_spec.rb
spec/unit/parser/functions/extlookup_spec.rb
spec/unit/resource/catalog_spec.rb
test/language/ast/variable.rb
Diffstat (limited to 'test/lib/puppettest')
| -rwxr-xr-x | test/lib/puppettest/support/resources.rb | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/lib/puppettest/testcase.rb | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/test/lib/puppettest/support/resources.rb b/test/lib/puppettest/support/resources.rb index 2b922bb1e..d5bf98f91 100755 --- a/test/lib/puppettest/support/resources.rb +++ b/test/lib/puppettest/support/resources.rb @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -# -# Created by Luke A. Kanies on 2006-11-29. -# Copyright (c) 2006. All rights reserved. - module PuppetTest::Support::Resources def tree_resource(name) Puppet::Type.type(:file).new :title => name, :path => "/tmp/#{name}", :mode => 0755 diff --git a/test/lib/puppettest/testcase.rb b/test/lib/puppettest/testcase.rb index b1b22e524..0ec98846c 100644..100755 --- a/test/lib/puppettest/testcase.rb +++ b/test/lib/puppettest/testcase.rb @@ -1,8 +1,4 @@ #!/usr/bin/env ruby -# -# Created by Luke A. Kanies on 2007-03-05. -# Copyright (c) 2007. All rights reserved. - require 'puppettest' require 'puppettest/runnable_test' require 'test/unit' |