diff options
Diffstat (limited to 'test')
135 files changed, 36 insertions, 149 deletions
diff --git a/test/certmgr/ca.rb b/test/certmgr/ca.rb index f464f4501..543d3dd25 100755 --- a/test/certmgr/ca.rb +++ b/test/certmgr/ca.rb @@ -85,4 +85,3 @@ class TestCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb index 3d863dc27..a0cc3abc9 100755 --- a/test/certmgr/certmgr.rb +++ b/test/certmgr/certmgr.rb @@ -297,4 +297,3 @@ class TestCertMgr < Test::Unit::TestCase end end -# $Id$ diff --git a/test/certmgr/inventory.rb b/test/certmgr/inventory.rb index 9efcb0c09..55b9cec6d 100755 --- a/test/certmgr/inventory.rb +++ b/test/certmgr/inventory.rb @@ -65,4 +65,3 @@ class TestCertInventory < Test::Unit::TestCase end end -# $Id$ diff --git a/test/certmgr/support.rb b/test/certmgr/support.rb index e6080a237..b0b79a62f 100755 --- a/test/certmgr/support.rb +++ b/test/certmgr/support.rb @@ -80,4 +80,3 @@ class TestCertSupport < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/filebucket.rb b/test/executables/filebucket.rb index 421eeb1fd..82746bde9 100755 --- a/test/executables/filebucket.rb +++ b/test/executables/filebucket.rb @@ -46,4 +46,3 @@ class TestFileBucketExe < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb index b58718112..e498a85d2 100755 --- a/test/executables/puppetbin.rb +++ b/test/executables/puppetbin.rb @@ -85,4 +85,3 @@ class TestPuppetBin < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb index 82e90df72..e1c516d98 100755 --- a/test/executables/puppetca.rb +++ b/test/executables/puppetca.rb @@ -113,4 +113,3 @@ class TestPuppetCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb index 220ff4283..ea63d70f2 100755 --- a/test/executables/puppetd.rb +++ b/test/executables/puppetd.rb @@ -56,4 +56,3 @@ class TestPuppetDExe < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb index 5195fa345..58726db45 100755 --- a/test/executables/puppetmasterd.rb +++ b/test/executables/puppetmasterd.rb @@ -140,4 +140,3 @@ class TestPuppetMasterD < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb index 58ce11978..9e04bc2e8 100755 --- a/test/executables/puppetmodule.rb +++ b/test/executables/puppetmodule.rb @@ -53,4 +53,3 @@ class TestPuppetModule < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/ast/casestatement.rb b/test/language/ast/casestatement.rb index 036216757..4623a2235 100755 --- a/test/language/ast/casestatement.rb +++ b/test/language/ast/casestatement.rb @@ -101,4 +101,3 @@ class TestCaseStatement < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/ast/selector.rb b/test/language/ast/selector.rb index c7dfeb2fe..7394f5f7d 100755 --- a/test/language/ast/selector.rb +++ b/test/language/ast/selector.rb @@ -59,4 +59,3 @@ class TestSelector < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb index 42c33d80d..bf22021d0 100755 --- a/test/language/ast/variable.rb +++ b/test/language/ast/variable.rb @@ -28,4 +28,3 @@ class TestVariable < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/functions.rb b/test/language/functions.rb index be06d8eac..2a392e01a 100755 --- a/test/language/functions.rb +++ b/test/language/functions.rb @@ -536,4 +536,3 @@ class TestLangFunctions < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/lexer.rb b/test/language/lexer.rb index c2dd17324..38a7ddb22 100755 --- a/test/language/lexer.rb +++ b/test/language/lexer.rb @@ -274,4 +274,3 @@ class TestLexer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/parser.rb b/test/language/parser.rb index 6f7599f27..9109686cb 100755 --- a/test/language/parser.rb +++ b/test/language/parser.rb @@ -1202,4 +1202,3 @@ file { "/tmp/yayness": end end -# $Id$ diff --git a/test/language/scope.rb b/test/language/scope.rb index 74f47b136..b4db5ef40 100755 --- a/test/language/scope.rb +++ b/test/language/scope.rb @@ -515,4 +515,3 @@ Host <<||>>" end end -# $Id$ diff --git a/test/language/transportable.rb b/test/language/transportable.rb index 3ef82983c..31931c937 100755 --- a/test/language/transportable.rb +++ b/test/language/transportable.rb @@ -104,4 +104,3 @@ class TestTransportable < Test::Unit::TestCase end end -# $Id$ diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 021d6d1de..d1e690e70 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -312,4 +312,3 @@ require 'puppettest/parsertesting' require 'puppettest/servertest' require 'puppettest/testcase' -# $Id$ diff --git a/test/lib/puppettest/certificates.rb b/test/lib/puppettest/certificates.rb index ff19b95b3..fbd18e997 100644 --- a/test/lib/puppettest/certificates.rb +++ b/test/lib/puppettest/certificates.rb @@ -58,4 +58,3 @@ module PuppetTest::Certificates end end -# $Id$ diff --git a/test/lib/puppettest/exetest.rb b/test/lib/puppettest/exetest.rb index 8d91b88cc..be148a169 100644 --- a/test/lib/puppettest/exetest.rb +++ b/test/lib/puppettest/exetest.rb @@ -127,4 +127,3 @@ module PuppetTest::ExeTest end end -# $Id$ diff --git a/test/lib/puppettest/fakes.rb b/test/lib/puppettest/fakes.rb index df1c3732e..739b098bc 100644 --- a/test/lib/puppettest/fakes.rb +++ b/test/lib/puppettest/fakes.rb @@ -202,4 +202,3 @@ module PuppetTest module_function :fakeprovider end -# $Id$ diff --git a/test/lib/puppettest/fileparsing.rb b/test/lib/puppettest/fileparsing.rb index ba4f5ad9c..9f7716ab2 100644 --- a/test/lib/puppettest/fileparsing.rb +++ b/test/lib/puppettest/fileparsing.rb @@ -30,4 +30,3 @@ module PuppetTest::FileParsing end end -# $Id$ diff --git a/test/lib/puppettest/filetesting.rb b/test/lib/puppettest/filetesting.rb index 43a2ae1a0..1aa1cf703 100644 --- a/test/lib/puppettest/filetesting.rb +++ b/test/lib/puppettest/filetesting.rb @@ -228,4 +228,3 @@ module PuppetTest::FileTesting end end -# $Id$ diff --git a/test/lib/puppettest/railstesting.rb b/test/lib/puppettest/railstesting.rb index 403bdb756..a9d8601f3 100644 --- a/test/lib/puppettest/railstesting.rb +++ b/test/lib/puppettest/railstesting.rb @@ -51,4 +51,3 @@ module PuppetTest::RailsTesting end end -# $Id$ diff --git a/test/lib/puppettest/reporttesting.rb b/test/lib/puppettest/reporttesting.rb index 67d715d4a..9b1764cf6 100644 --- a/test/lib/puppettest/reporttesting.rb +++ b/test/lib/puppettest/reporttesting.rb @@ -16,4 +16,3 @@ module PuppetTest::Reporttesting end end -# $Id$ diff --git a/test/lib/puppettest/resourcetesting.rb b/test/lib/puppettest/resourcetesting.rb index 325602c22..d4469a203 100644 --- a/test/lib/puppettest/resourcetesting.rb +++ b/test/lib/puppettest/resourcetesting.rb @@ -43,4 +43,3 @@ module PuppetTest::ResourceTesting end end -# $Id$ diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb index 018715a54..3d1381111 100644 --- a/test/lib/puppettest/servertest.rb +++ b/test/lib/puppettest/servertest.rb @@ -69,4 +69,3 @@ module PuppetTest::ServerTest end -# $Id$ diff --git a/test/lib/puppettest/support/collection.rb b/test/lib/puppettest/support/collection.rb index 305b805d5..43df03048 100644 --- a/test/lib/puppettest/support/collection.rb +++ b/test/lib/puppettest/support/collection.rb @@ -27,4 +27,3 @@ module PuppetTest::Support::Collection end end -# $Id$ diff --git a/test/lib/puppettest/support/helpers.rb b/test/lib/puppettest/support/helpers.rb index dc01fa3b8..5b1872dfb 100644 --- a/test/lib/puppettest/support/helpers.rb +++ b/test/lib/puppettest/support/helpers.rb @@ -20,4 +20,3 @@ module PuppetTest end end -# $Id$ diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb index b5189202f..ee29a8875 100644 --- a/test/lib/puppettest/support/utils.rb +++ b/test/lib/puppettest/support/utils.rb @@ -171,4 +171,3 @@ module PuppetTest end end -# $Id$ diff --git a/test/lib/rake/puppet_test_loader.rb b/test/lib/rake/puppet_test_loader.rb index 23033fa5d..be3319ccc 100644 --- a/test/lib/rake/puppet_test_loader.rb +++ b/test/lib/rake/puppet_test_loader.rb @@ -14,4 +14,3 @@ unless runner.run exit 14 end -# $Id$ diff --git a/test/lib/rake/puppet_testtask.rb b/test/lib/rake/puppet_testtask.rb index a53f0753d..6e8e3642a 100644 --- a/test/lib/rake/puppet_testtask.rb +++ b/test/lib/rake/puppet_testtask.rb @@ -14,4 +14,3 @@ module Rake end end -# $Id$ diff --git a/test/network/authconfig.rb b/test/network/authconfig.rb index 2f99f0ede..e22431c75 100755 --- a/test/network/authconfig.rb +++ b/test/network/authconfig.rb @@ -68,5 +68,4 @@ class TestAuthConfig < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/authorization.rb b/test/network/authorization.rb index f0ce0af7f..766c454e0 100755 --- a/test/network/authorization.rb +++ b/test/network/authorization.rb @@ -134,5 +134,4 @@ class TestAuthConfig < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/authstore.rb b/test/network/authstore.rb index ae407c96e..6d2bc08e2 100755 --- a/test/network/authstore.rb +++ b/test/network/authstore.rb @@ -446,5 +446,4 @@ class TestAuthStoreDeclaration < PuppetTest::TestCase end end -# $Id$ diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb index 511b6fcaa..c996e1abd 100755 --- a/test/network/client/ca.rb +++ b/test/network/client/ca.rb @@ -62,4 +62,3 @@ class TestClientCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client/client.rb b/test/network/client/client.rb index 382cd55cf..484c794e4 100755 --- a/test/network/client/client.rb +++ b/test/network/client/client.rb @@ -256,4 +256,3 @@ class TestClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client/dipper.rb b/test/network/client/dipper.rb index e91dea2a7..d48b50478 100755 --- a/test/network/client/dipper.rb +++ b/test/network/client/dipper.rb @@ -32,4 +32,3 @@ class TestDipperClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client/resource.rb b/test/network/client/resource.rb index da066e5b2..2b034f079 100755 --- a/test/network/client/resource.rb +++ b/test/network/client/resource.rb @@ -80,4 +80,3 @@ class TestResourceClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client_request.rb b/test/network/client_request.rb index 7c6e9b3c8..f7804ec07 100755 --- a/test/network/client_request.rb +++ b/test/network/client_request.rb @@ -35,5 +35,4 @@ class TestClientRequest < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/daemon.rb b/test/network/daemon.rb index 89f88ddce..e794ce241 100755 --- a/test/network/daemon.rb +++ b/test/network/daemon.rb @@ -67,5 +67,4 @@ class TestDaemon < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb index 65badc9eb..30a192f09 100755 --- a/test/network/handler/bucket.rb +++ b/test/network/handler/bucket.rb @@ -342,4 +342,3 @@ class TestBucket < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb index f503d7c7a..3e74f8e05 100755 --- a/test/network/handler/ca.rb +++ b/test/network/handler/ca.rb @@ -272,4 +272,3 @@ class TestCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index b81262947..8dcbf63ea 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -1150,5 +1150,4 @@ allow * end end -# $Id$ diff --git a/test/network/handler/handler.rb b/test/network/handler/handler.rb index df49ee580..b812ca3d3 100755 --- a/test/network/handler/handler.rb +++ b/test/network/handler/handler.rb @@ -61,4 +61,3 @@ class TestHandler < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb index 4f8e7fab2..42c4d22c9 100755 --- a/test/network/handler/master.rb +++ b/test/network/handler/master.rb @@ -158,5 +158,4 @@ class TestMaster < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/report.rb b/test/network/handler/report.rb index 17cf21c7a..ac8cf6fac 100755 --- a/test/network/handler/report.rb +++ b/test/network/handler/report.rb @@ -181,5 +181,4 @@ class TestReportServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/resource.rb b/test/network/handler/resource.rb index 18f52dbd6..b2acc00b9 100755 --- a/test/network/handler/resource.rb +++ b/test/network/handler/resource.rb @@ -291,4 +291,3 @@ class TestResourceServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/runner.rb b/test/network/handler/runner.rb index b6df9bab9..23883a17c 100755 --- a/test/network/handler/runner.rb +++ b/test/network/handler/runner.rb @@ -104,5 +104,4 @@ class TestHandlerRunner < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/rights.rb b/test/network/rights.rb index edbcaac80..a3e780330 100755 --- a/test/network/rights.rb +++ b/test/network/rights.rb @@ -34,5 +34,4 @@ class TestRights < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/server/mongrel_test.rb b/test/network/server/mongrel_test.rb index b7a383872..05d18257b 100755 --- a/test/network/server/mongrel_test.rb +++ b/test/network/server/mongrel_test.rb @@ -89,4 +89,3 @@ class TestMongrelServer < PuppetTest::TestCase end end -# $Id$ diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb index a9448fe6c..0f76659b1 100755 --- a/test/network/server/webrick.rb +++ b/test/network/server/webrick.rb @@ -144,4 +144,3 @@ class TestWebrickServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/client.rb b/test/network/xmlrpc/client.rb index f3c6d2388..a81e95a86 100755 --- a/test/network/xmlrpc/client.rb +++ b/test/network/xmlrpc/client.rb @@ -71,5 +71,4 @@ class TestXMLRPCClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/processor.rb b/test/network/xmlrpc/processor.rb index 6808d0100..bc29f4c23 100755 --- a/test/network/xmlrpc/processor.rb +++ b/test/network/xmlrpc/processor.rb @@ -77,5 +77,4 @@ class TestXMLRPCProcessor < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/server.rb b/test/network/xmlrpc/server.rb index 65e5f1126..ff9f72e0c 100755 --- a/test/network/xmlrpc/server.rb +++ b/test/network/xmlrpc/server.rb @@ -24,5 +24,4 @@ class TestXMLRPCServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/webrick_servlet.rb b/test/network/xmlrpc/webrick_servlet.rb index e7a6af171..154cc6cf9 100755 --- a/test/network/xmlrpc/webrick_servlet.rb +++ b/test/network/xmlrpc/webrick_servlet.rb @@ -29,5 +29,4 @@ class TestXMLRPCWEBrickServlet < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/dsl.rb b/test/other/dsl.rb index 59610cd0f..0d891bf1a 100755 --- a/test/other/dsl.rb +++ b/test/other/dsl.rb @@ -4,7 +4,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppet/dsl' -require 'puppet/util/autoload' require 'puppettest' class TestDSL < Test::Unit::TestCase diff --git a/test/other/events.rb b/test/other/events.rb index b67ea05a1..30b045695 100755 --- a/test/other/events.rb +++ b/test/other/events.rb @@ -5,7 +5,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppettest' -# $Id$ class TestEvents < Test::Unit::TestCase include PuppetTest diff --git a/test/other/overrides.rb b/test/other/overrides.rb index 9a7c4b8ba..bfdf174a4 100755 --- a/test/other/overrides.rb +++ b/test/other/overrides.rb @@ -105,4 +105,3 @@ class TestOverrides < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/propertychange.rb b/test/other/propertychange.rb index 6d5c91b34..34669771b 100755 --- a/test/other/propertychange.rb +++ b/test/other/propertychange.rb @@ -138,4 +138,3 @@ class TestPropertyChange < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/provider.rb b/test/other/provider.rb index 9a9b00a70..a39c4e1e9 100755 --- a/test/other/provider.rb +++ b/test/other/provider.rb @@ -159,4 +159,3 @@ class TestImpl < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/puppet.rb b/test/other/puppet.rb index b9bf16475..45039e3c6 100755 --- a/test/other/puppet.rb +++ b/test/other/puppet.rb @@ -129,4 +129,3 @@ class TestPuppetModule < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/relationship.rb b/test/other/relationship.rb index 0a4d725ae..60c240b7a 100755 --- a/test/other/relationship.rb +++ b/test/other/relationship.rb @@ -71,4 +71,3 @@ class TestRelationship < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/relationships.rb b/test/other/relationships.rb index 771b119ee..edf97373c 100755 --- a/test/other/relationships.rb +++ b/test/other/relationships.rb @@ -213,4 +213,3 @@ class TestRelationships < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/report.rb b/test/other/report.rb index 3de2dfbee..8f33a7166 100755 --- a/test/other/report.rb +++ b/test/other/report.rb @@ -243,4 +243,3 @@ class TestReports < Test::Unit::TestCase end end -# $Id$ diff --git a/test/puppet/conffiles.rb b/test/puppet/conffiles.rb index 1800c80f6..06f563a08 100755 --- a/test/puppet/conffiles.rb +++ b/test/puppet/conffiles.rb @@ -105,4 +105,3 @@ class TestConfFiles < Test::Unit::TestCase end -# $Id$ diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb index 383153e45..3d7ee384a 100755 --- a/test/puppet/defaults.rb +++ b/test/puppet/defaults.rb @@ -5,7 +5,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppettest' -# $Id$ class TestPuppetDefaults < Test::Unit::TestCase include PuppetTest diff --git a/test/puppet/errortest.rb b/test/puppet/errortest.rb index 27a09ae5a..fb06a30f0 100755 --- a/test/puppet/errortest.rb +++ b/test/puppet/errortest.rb @@ -17,4 +17,3 @@ class TestError < Test::Unit::TestCase end end -# $Id$ diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb index ba16b5ef8..905d3d0c9 100755 --- a/test/puppet/tc_suidmanager.rb +++ b/test/puppet/tc_suidmanager.rb @@ -101,4 +101,3 @@ class TestSUIDManager < Test::Unit::TestCase end end -# $Id$ diff --git a/test/rails/ast.rb b/test/rails/ast.rb index fb6374401..48ec18c45 100755 --- a/test/rails/ast.rb +++ b/test/rails/ast.rb @@ -71,4 +71,3 @@ class TestRailsAST < PuppetTest::TestCase end end -# $Id$ diff --git a/test/rails/collection.rb b/test/rails/collection.rb index 56f71e635..cbae9a1e4 100755 --- a/test/rails/collection.rb +++ b/test/rails/collection.rb @@ -238,4 +238,3 @@ class TestRailsCollection < PuppetTest::TestCase end end -# $Id$ diff --git a/test/rails/host.rb b/test/rails/host.rb index 5ac2f763e..4d9c64932 100755 --- a/test/rails/host.rb +++ b/test/rails/host.rb @@ -189,4 +189,3 @@ class TestRailsHost < PuppetTest::TestCase end end -# $Id$ diff --git a/test/rails/rails.rb b/test/rails/rails.rb index 2803e07a8..f6756ed24 100755 --- a/test/rails/rails.rb +++ b/test/rails/rails.rb @@ -24,4 +24,3 @@ class TestRails < Test::Unit::TestCase end end -# $Id$ diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb index 89c81ad30..c2a82929d 100755 --- a/test/rails/railsparameter.rb +++ b/test/rails/railsparameter.rb @@ -70,4 +70,3 @@ else $stderr.puts "Install Rails for Rails and Caching tests" end -# $Id$ diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb index ca582b8b0..7a1ffd217 100755 --- a/test/rails/railsresource.rb +++ b/test/rails/railsresource.rb @@ -247,5 +247,4 @@ class TestExportedResources < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb index ef8742d48..28cb07f69 100755 --- a/test/ral/manager/attributes.rb +++ b/test/ral/manager/attributes.rb @@ -349,4 +349,3 @@ class TestTypeAttributes < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/manager/instances.rb b/test/ral/manager/instances.rb index e7a43488a..14b85f95d 100755 --- a/test/ral/manager/instances.rb +++ b/test/ral/manager/instances.rb @@ -106,4 +106,3 @@ class TestTypeInstances < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/manager/manager.rb b/test/ral/manager/manager.rb index 8a273ecfd..4f2ade4e9 100755 --- a/test/ral/manager/manager.rb +++ b/test/ral/manager/manager.rb @@ -52,4 +52,3 @@ class TestTypeManager < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/manager/provider.rb b/test/ral/manager/provider.rb index 1fcb5efbc..0aeac357f 100755 --- a/test/ral/manager/provider.rb +++ b/test/ral/manager/provider.rb @@ -89,4 +89,3 @@ class TestTypeProviders < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb index 7df7bab3d..bc32b839b 100755 --- a/test/ral/providers/cron/crontab.rb +++ b/test/ral/providers/cron/crontab.rb @@ -52,7 +52,6 @@ class TestCronParsedProvider < Test::Unit::TestCase def teardown Puppet::Util::FileType.filetype(:ram).clear - @provider.filetype = @oldfiletype @provider.clear super end @@ -211,7 +210,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Take our sample files, and make sure we can entirely parse them, # then that we can generate them again and we get the same data. def test_parse_and_generate_sample_files - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) crondir = datadir(File.join(%w{providers cron})) files = Dir.glob("%s/crontab.*" % crondir) @@ -306,7 +305,7 @@ class TestCronParsedProvider < Test::Unit::TestCase str = "# this is a comment\n#and another comment\n" user = "fakeuser" records = nil - target = @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) target = @provider.target_object(user) target.write(str) assert_nothing_raised { @@ -320,7 +319,7 @@ class TestCronParsedProvider < Test::Unit::TestCase end def test_simpleparsing - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) text = "5 1,2 * 1 0 /bin/echo funtest" records = nil @@ -376,7 +375,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Make sure we correctly bidirectionally parse things. def test_records_and_strings - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) setme target = @provider.target_object(@me) @@ -426,7 +425,7 @@ class TestCronParsedProvider < Test::Unit::TestCase 0,30 * * 1 * fooness " setme - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) you = "you" # Write the same tab to multiple targets @@ -486,7 +485,7 @@ class TestCronParsedProvider < Test::Unit::TestCase def test_data setme - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) target = @provider.target_object(@me) fakedata("data/providers/cron/examples").each do |file| text = File.read(file) @@ -518,7 +517,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Match freebsd's annoying @daily stuff. def test_match_freebsd_special - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) setme target = @provider.target_object(@me) @@ -561,7 +560,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Testing #669. def test_environment_settings - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) setme target = @provider.target_object(@me) @@ -601,4 +600,3 @@ class TestCronParsedProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb index 158fc4afa..2d5122da0 100755 --- a/test/ral/providers/group.rb +++ b/test/ral/providers/group.rb @@ -249,4 +249,3 @@ class TestGroupProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/host/netinfo.rb b/test/ral/providers/host/netinfo.rb index 674253d3c..f49a00beb 100755 --- a/test/ral/providers/host/netinfo.rb +++ b/test/ral/providers/host/netinfo.rb @@ -54,4 +54,3 @@ end end end -# $Id$ diff --git a/test/ral/providers/host/parsed.rb b/test/ral/providers/host/parsed.rb index 85f5cb664..5499b0220 100755 --- a/test/ral/providers/host/parsed.rb +++ b/test/ral/providers/host/parsed.rb @@ -223,4 +223,3 @@ class TestParsedHostProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/mailalias/aliases.rb b/test/ral/providers/mailalias/aliases.rb index d0a95d877..e54b6659a 100755 --- a/test/ral/providers/mailalias/aliases.rb +++ b/test/ral/providers/mailalias/aliases.rb @@ -54,4 +54,3 @@ class TestMailaliasAliasesProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/mount/netinfo.rb b/test/ral/providers/mount/netinfo.rb index af65e5a4d..dc4316b8a 100755 --- a/test/ral/providers/mount/netinfo.rb +++ b/test/ral/providers/mount/netinfo.rb @@ -77,4 +77,3 @@ require 'puppettest' # end # end -# $Id$ diff --git a/test/ral/providers/mount/parsed.rb b/test/ral/providers/mount/parsed.rb index 9637a840f..4fe644734 100755 --- a/test/ral/providers/mount/parsed.rb +++ b/test/ral/providers/mount/parsed.rb @@ -248,4 +248,3 @@ class TestParsedMountsNonDarwinAsRoot < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/providers/nameservice.rb b/test/ral/providers/nameservice.rb index f63853af3..f15e51d02 100755 --- a/test/ral/providers/nameservice.rb +++ b/test/ral/providers/nameservice.rb @@ -30,4 +30,3 @@ class TestNameServiceProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb index 969bd39a1..a0283b363 100755 --- a/test/ral/providers/package.rb +++ b/test/ral/providers/package.rb @@ -275,4 +275,3 @@ class TestPackageProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/package/apt.rb b/test/ral/providers/package/apt.rb index a82f1bc3a..f4fb1a95c 100755 --- a/test/ral/providers/package/apt.rb +++ b/test/ral/providers/package/apt.rb @@ -167,4 +167,3 @@ class AptPackageProviderTest < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb index a3257bcce..c005ee5a6 100755 --- a/test/ral/providers/package/aptrpm.rb +++ b/test/ral/providers/package/aptrpm.rb @@ -86,4 +86,3 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb index 053a1993d..8a5982553 100755 --- a/test/ral/providers/parsedfile.rb +++ b/test/ral/providers/parsedfile.rb @@ -695,5 +695,4 @@ class TestParsedFile < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/port/parsed.rb b/test/ral/providers/port/parsed.rb index acd6eda1f..b8237ad86 100755 --- a/test/ral/providers/port/parsed.rb +++ b/test/ral/providers/port/parsed.rb @@ -230,4 +230,3 @@ require 'puppettest' # end #end -# $Id$ diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb index 7fcf3f59d..ee7eb1bca 100755 --- a/test/ral/providers/provider.rb +++ b/test/ral/providers/provider.rb @@ -500,4 +500,3 @@ class TestProviderFeatures < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/service.rb b/test/ral/providers/service.rb index 5a4a6c1c2..c4127146f 100755 --- a/test/ral/providers/service.rb +++ b/test/ral/providers/service.rb @@ -232,4 +232,3 @@ class TestLocalService < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb index 03e7105ca..7300b77af 100755 --- a/test/ral/providers/service/base.rb +++ b/test/ral/providers/service/base.rb @@ -72,4 +72,3 @@ class TestBaseServiceProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/sshkey/parsed.rb b/test/ral/providers/sshkey/parsed.rb index 4a8ce07f1..017bb983f 100755 --- a/test/ral/providers/sshkey/parsed.rb +++ b/test/ral/providers/sshkey/parsed.rb @@ -108,4 +108,3 @@ class TestParsedSSHKey < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb index 7e5290549..1c2fd2f1f 100755 --- a/test/ral/providers/user.rb +++ b/test/ral/providers/user.rb @@ -563,4 +563,3 @@ class TestUserProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/user/useradd.rb b/test/ral/providers/user/useradd.rb index 55bb96f2a..28692be6c 100755 --- a/test/ral/providers/user/useradd.rb +++ b/test/ral/providers/user/useradd.rb @@ -243,4 +243,3 @@ class UserRootAddProviderTest < PuppetTest::TestCase end -# $Id$ diff --git a/test/ral/types/cron.rb b/test/ral/types/cron.rb index 1695befac..05fd342d5 100755 --- a/test/ral/types/cron.rb +++ b/test/ral/types/cron.rb @@ -17,8 +17,7 @@ class TestCron < Test::Unit::TestCase @crontype = Puppet::Type.type(:cron) @provider = @crontype.defaultprovider if @provider.respond_to?(:filetype=) - @oldfiletype = @provider.filetype - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) end @crontype = Puppet::Type.type(:cron) end @@ -26,9 +25,6 @@ class TestCron < Test::Unit::TestCase def teardown super @crontype.defaultprovider = nil - if defined? @oldfiletype - @provider.filetype = @oldfiletype - end Puppet::Util::FileType.filetype(:ram).clear end @@ -501,4 +497,3 @@ class TestCron < Test::Unit::TestCase end -# $Id$ diff --git a/test/ral/types/exec.rb b/test/ral/types/exec.rb index 0c7cc1d90..e7ffa0aec 100755 --- a/test/ral/types/exec.rb +++ b/test/ral/types/exec.rb @@ -728,4 +728,3 @@ and stuff" end end -# $Id$ diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb index 0c16d6dff..de8d60447 100755 --- a/test/ral/types/file.rb +++ b/test/ral/types/file.rb @@ -1813,4 +1813,3 @@ class TestFile < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/file/target.rb b/test/ral/types/file/target.rb index c4597cedf..8dda94e92 100755 --- a/test/ral/types/file/target.rb +++ b/test/ral/types/file/target.rb @@ -360,4 +360,3 @@ class TestFileTarget < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/filebucket.rb b/test/ral/types/filebucket.rb index 5b0093425..094a5da2b 100755 --- a/test/ral/types/filebucket.rb +++ b/test/ral/types/filebucket.rb @@ -153,4 +153,3 @@ class TestFileBucket < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb index 01d9766db..9517db5a5 100755 --- a/test/ral/types/filesources.rb +++ b/test/ral/types/filesources.rb @@ -955,8 +955,13 @@ class TestFileSources < Test::Unit::TestCase files = [] [source1, source2, File.join(source1, "subdir"), File.join(source2, "subdir")].each_with_index do |dir, i| Dir.mkdir(dir) + # Make a single file in each directory file = File.join(dir, "file%s" % i) File.open(file, "w") { |f| f.puts "yay%s" % i} + + # Now make a second one in each directory + file = File.join(dir, "second-file%s" % i) + File.open(file, "w") { |f| f.puts "yaysecond-%s" % i} files << file end @@ -964,7 +969,7 @@ class TestFileSources < Test::Unit::TestCase assert_apply(obj) - ["file0", "file1", "subdir/file2", "subdir/file3"].each do |file| + ["file0", "file1", "second-file0", "second-file1", "subdir/file2", "subdir/second-file2", "subdir/file3", "subdir/second-file3"].each do |file| path = File.join(dest, file) assert(FileTest.exists?(path), "did not create %s" % file) @@ -1000,4 +1005,3 @@ class TestFileSources < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/host.rb b/test/ral/types/host.rb index 57d425e7c..8244caed0 100755 --- a/test/ral/types/host.rb +++ b/test/ral/types/host.rb @@ -159,4 +159,3 @@ class TestHost < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/interface.rb b/test/ral/types/interface.rb index 0e2768d9e..0de538721 100755 --- a/test/ral/types/interface.rb +++ b/test/ral/types/interface.rb @@ -37,4 +37,3 @@ class TestInterfaceType < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/types/mailalias.rb b/test/ral/types/mailalias.rb index 6dce531e9..544e6d2ae 100755 --- a/test/ral/types/mailalias.rb +++ b/test/ral/types/mailalias.rb @@ -47,4 +47,3 @@ class TestMailAlias < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/mount.rb b/test/ral/types/mount.rb index c4314db98..fa5022e3d 100755 --- a/test/ral/types/mount.rb +++ b/test/ral/types/mount.rb @@ -359,4 +359,3 @@ class TestMounts < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/types/package.rb b/test/ral/types/package.rb index e97c6bd3c..d09cfdc8e 100755 --- a/test/ral/types/package.rb +++ b/test/ral/types/package.rb @@ -154,4 +154,3 @@ class TestPackages < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/parameter.rb b/test/ral/types/parameter.rb index bc79d0bd5..70c325e08 100755 --- a/test/ral/types/parameter.rb +++ b/test/ral/types/parameter.rb @@ -169,4 +169,3 @@ class TestParameter < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/port.rb b/test/ral/types/port.rb index 30292e1af..743107e44 100755 --- a/test/ral/types/port.rb +++ b/test/ral/types/port.rb @@ -145,4 +145,3 @@ require 'puppettest' # end #end -# $Id$ diff --git a/test/ral/types/property.rb b/test/ral/types/property.rb index 27998d6fd..2ad5212b7 100755 --- a/test/ral/types/property.rb +++ b/test/ral/types/property.rb @@ -385,4 +385,3 @@ class TestProperty < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/resources.rb b/test/ral/types/resources.rb index 82d4e225d..3ee785444 100755 --- a/test/ral/types/resources.rb +++ b/test/ral/types/resources.rb @@ -206,4 +206,3 @@ class TestResources < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/schedule.rb b/test/ral/types/schedule.rb index cc565bbfc..a07ac791e 100755 --- a/test/ral/types/schedule.rb +++ b/test/ral/types/schedule.rb @@ -354,4 +354,3 @@ class TestSchedule < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/service.rb b/test/ral/types/service.rb index 488cd7147..b187a08cd 100755 --- a/test/ral/types/service.rb +++ b/test/ral/types/service.rb @@ -36,4 +36,3 @@ class TestServiceType < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/sshkey.rb b/test/ral/types/sshkey.rb index 9a20dc251..26349e382 100755 --- a/test/ral/types/sshkey.rb +++ b/test/ral/types/sshkey.rb @@ -189,4 +189,3 @@ class TestSSHKey < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/tidy.rb b/test/ral/types/tidy.rb index 8fada1adb..521f1acc5 100755 --- a/test/ral/types/tidy.rb +++ b/test/ral/types/tidy.rb @@ -228,4 +228,3 @@ class TestTidy < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/user.rb b/test/ral/types/user.rb index 9b24cc74a..9a76c0585 100755 --- a/test/ral/types/user.rb +++ b/test/ral/types/user.rb @@ -490,4 +490,3 @@ class TestUser < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/zone.rb b/test/ral/types/zone.rb index d68306201..eef791361 100755 --- a/test/ral/types/zone.rb +++ b/test/ral/types/zone.rb @@ -418,4 +418,3 @@ end end end -# $Id$ diff --git a/test/util/autoload.rb b/test/util/autoload.rb index bae6d37d4..ca77572c2 100755 --- a/test/util/autoload.rb +++ b/test/util/autoload.rb @@ -102,4 +102,25 @@ TestAutoload.newthing(:#{name.to_s}) assert(loader.send(:searchpath).include?(dir), "searchpath does not include the libdir") end + + # This causes very strange behaviour in the tests. We need to make sure we + # require the same path that a user would use, otherwise we'll result in + # a reload of the + def test_require_does_not_cause_reload + loadname = "testing" + loader = Puppet::Util::Autoload.new(self.class, loadname) + + basedir = "/some/dir" + dir = File.join(basedir, loadname) + loader.expects(:eachdir).yields(dir) + + subname = "instance" + + file = File.join(dir, subname) + ".rb" + + Dir.expects(:glob).with("#{dir}/*.rb").returns(file) + + Kernel.expects(:require).with(File.join(loadname, subname)) + loader.loadall + end end diff --git a/test/util/classgen.rb b/test/util/classgen.rb index 778bdbb4f..0ecb61f56 100755 --- a/test/util/classgen.rb +++ b/test/util/classgen.rb @@ -224,4 +224,3 @@ class TestPuppetUtilClassGen < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/execution.rb b/test/util/execution.rb index 0b3541775..ce748c75a 100755 --- a/test/util/execution.rb +++ b/test/util/execution.rb @@ -31,4 +31,3 @@ class TestPuppetUtilExecution < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb index 9a892c383..127dbe1d1 100755 --- a/test/util/fileparsing.rb +++ b/test/util/fileparsing.rb @@ -673,5 +673,4 @@ class TestUtilFileRecord < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/filetype.rb b/test/util/filetype.rb index 2c4a16fc2..e98fb5f6c 100755 --- a/test/util/filetype.rb +++ b/test/util/filetype.rb @@ -135,4 +135,3 @@ class TestFileType < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/instance_loader.rb b/test/util/instance_loader.rb index 24e8c9cab..be055fc5c 100755 --- a/test/util/instance_loader.rb +++ b/test/util/instance_loader.rb @@ -50,4 +50,3 @@ class TestInstanceloader < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/loadedfile.rb b/test/util/loadedfile.rb index f7f9f6e23..801ba5b2a 100755 --- a/test/util/loadedfile.rb +++ b/test/util/loadedfile.rb @@ -119,4 +119,3 @@ class TestLoadedFile < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/log.rb b/test/util/log.rb index 9ede9176a..0e5a542db 100755 --- a/test/util/log.rb +++ b/test/util/log.rb @@ -272,4 +272,3 @@ class TestLog < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/metrics.rb b/test/util/metrics.rb index fd997df17..2775b3ff1 100755 --- a/test/util/metrics.rb +++ b/test/util/metrics.rb @@ -75,4 +75,3 @@ class TestMetric < PuppetTest::TestCase end end -# $Id$ diff --git a/test/util/package.rb b/test/util/package.rb index 73b069f84..737d8e5b4 100755 --- a/test/util/package.rb +++ b/test/util/package.rb @@ -24,4 +24,3 @@ class TestPuppetUtilPackage < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb index 0dd437fa8..ae32c7a3f 100755 --- a/test/util/posixtest.rb +++ b/test/util/posixtest.rb @@ -167,4 +167,3 @@ class TestPosixUtil < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/settings.rb b/test/util/settings.rb index 62f34fda6..7dad04968 100755 --- a/test/util/settings.rb +++ b/test/util/settings.rb @@ -1104,4 +1104,3 @@ yay = /a/path end end -# $Id$ diff --git a/test/util/storage.rb b/test/util/storage.rb index dd68af5bf..d583e2c59 100755 --- a/test/util/storage.rb +++ b/test/util/storage.rb @@ -120,4 +120,3 @@ class TestStorage < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/subclass_loader.rb b/test/util/subclass_loader.rb index 5c8174cfa..2066785f7 100755 --- a/test/util/subclass_loader.rb +++ b/test/util/subclass_loader.rb @@ -97,4 +97,3 @@ class TestPuppetUtilSubclassLoader < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb index 405ddbb48..13a17ed6c 100755 --- a/test/util/utiltest.rb +++ b/test/util/utiltest.rb @@ -285,4 +285,3 @@ class TestPuppetUtil < Test::Unit::TestCase end end -# $Id$ |