puppet 0.23.2 → 0.24.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- data/CHANGELOG +112 -1
- data/README +1 -1
- data/Rakefile +1 -2
- data/bin/filebucket +2 -3
- data/bin/puppet +55 -39
- data/bin/puppetca +20 -11
- data/bin/puppetd +30 -31
- data/bin/puppetdoc +27 -28
- data/bin/puppetmasterd +24 -42
- data/bin/puppetrun +3 -4
- data/bin/ralsh +5 -7
- data/conf/redhat/puppet.spec +4 -1
- data/conf/solaris/smf/svc-puppetd +1 -1
- data/conf/solaris/smf/svc-puppetmasterd +1 -1
- data/examples/code/allatonce +1 -1
- data/examples/code/assignments +1 -1
- data/examples/code/components +1 -1
- data/examples/code/file.bl +1 -1
- data/examples/code/filedefaults +1 -1
- data/examples/code/fileparsing +1 -1
- data/examples/code/filerecursion +1 -1
- data/examples/code/functions +1 -1
- data/examples/code/groups +1 -1
- data/examples/code/head +1 -1
- data/examples/code/importing +1 -1
- data/examples/code/modules/sample-module.pp +10 -0
- data/examples/code/modules/sample-module/README.txt +17 -0
- data/examples/code/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb +36 -0
- data/examples/code/modules/sample-module/manifests/init.pp +12 -0
- data/examples/code/modules/sample-module/templates/sample.erb +5 -0
- data/examples/code/nodes +1 -1
- data/examples/code/one +1 -1
- data/examples/code/relationships +1 -1
- data/examples/code/selectors +1 -1
- data/examples/code/simpletests +1 -1
- data/examples/root/etc/init.d/sleeper +1 -1
- data/examples/root/etc/puppet/fileserver.conf +1 -1
- data/ext/ldap/puppet.schema +1 -1
- data/ext/module_puppet +30 -21
- data/ext/puppet-test +3 -3
- data/ext/vim/filetype.vim +1 -1
- data/install.rb +1 -2
- data/lib/puppet.rb +20 -19
- data/lib/puppet/checksum.rb +57 -0
- data/lib/puppet/config_stores/rest.rb +1 -1
- data/lib/puppet/daemon.rb +0 -1
- data/lib/puppet/{configuration.rb → defaults.rb} +56 -23
- data/lib/puppet/dsl.rb +22 -116
- data/lib/puppet/error.rb +0 -9
- data/lib/puppet/event.rb +0 -1
- data/lib/puppet/external/gratr/rdot.rb +0 -1
- data/lib/puppet/external/lock.rb +0 -1
- data/lib/puppet/feature/base.rb +3 -2
- data/lib/puppet/feature/rails.rb +0 -1
- data/lib/puppet/file_serving.rb +7 -0
- data/lib/puppet/file_serving/configuration.rb +129 -0
- data/lib/puppet/file_serving/configuration/parser.rb +124 -0
- data/lib/puppet/file_serving/content.rb +34 -0
- data/lib/puppet/file_serving/file_base.rb +63 -0
- data/lib/puppet/file_serving/fileset.rb +138 -0
- data/lib/puppet/file_serving/indirection_hooks.rb +44 -0
- data/lib/puppet/file_serving/metadata.rb +69 -0
- data/lib/puppet/file_serving/mount.rb +186 -0
- data/lib/puppet/file_serving/terminus_helper.rb +19 -0
- data/lib/puppet/indirector.rb +68 -0
- data/lib/puppet/indirector/catalog/compiler.rb +173 -0
- data/lib/puppet/indirector/catalog/yaml.rb +24 -0
- data/lib/puppet/indirector/checksum/file.rb +33 -0
- data/lib/puppet/indirector/code.rb +6 -0
- data/lib/puppet/indirector/direct_file_server.rb +27 -0
- data/lib/puppet/indirector/exec.rb +57 -0
- data/lib/puppet/indirector/facts/facter.rb +65 -0
- data/lib/puppet/indirector/facts/memory.rb +9 -0
- data/lib/puppet/indirector/facts/yaml.rb +7 -0
- data/lib/puppet/indirector/file.rb +54 -0
- data/lib/puppet/indirector/file_content.rb +5 -0
- data/lib/puppet/indirector/file_content/file.rb +11 -0
- data/lib/puppet/indirector/file_content/file_server.rb +11 -0
- data/lib/puppet/indirector/file_content/modules.rb +11 -0
- data/lib/puppet/indirector/file_content/rest.rb +12 -0
- data/lib/puppet/indirector/file_metadata.rb +5 -0
- data/lib/puppet/indirector/file_metadata/file.rb +26 -0
- data/lib/puppet/indirector/file_metadata/file_server.rb +11 -0
- data/lib/puppet/indirector/file_metadata/modules.rb +17 -0
- data/lib/puppet/indirector/file_metadata/rest.rb +12 -0
- data/lib/puppet/indirector/file_server.rb +56 -0
- data/lib/puppet/indirector/indirection.rb +237 -0
- data/lib/puppet/indirector/ldap.rb +90 -0
- data/lib/puppet/indirector/memory.rb +21 -0
- data/lib/puppet/indirector/module_files.rb +82 -0
- data/lib/puppet/indirector/node/exec.rb +52 -0
- data/lib/puppet/indirector/node/ldap.rb +120 -0
- data/lib/puppet/indirector/node/memory.rb +10 -0
- data/lib/puppet/indirector/node/plain.rb +19 -0
- data/lib/puppet/indirector/node/rest.rb +7 -0
- data/lib/puppet/indirector/node/yaml.rb +7 -0
- data/lib/puppet/indirector/plain.rb +9 -0
- data/lib/puppet/indirector/report/processor.rb +50 -0
- data/lib/puppet/indirector/rest.rb +8 -0
- data/lib/puppet/indirector/ssl_rsa.rb +5 -0
- data/lib/puppet/indirector/ssl_rsa/file.rb +33 -0
- data/lib/puppet/indirector/terminus.rb +178 -0
- data/lib/puppet/indirector/yaml.rb +57 -0
- data/lib/puppet/metatype/attributes.rb +3 -3
- data/lib/puppet/metatype/closure.rb +0 -66
- data/lib/puppet/metatype/container.rb +0 -9
- data/lib/puppet/metatype/evaluation.rb +10 -2
- data/lib/puppet/metatype/instances.rb +16 -30
- data/lib/puppet/metatype/manager.rb +1 -2
- data/lib/puppet/metatype/metaparams.rb +27 -21
- data/lib/puppet/metatype/providers.rb +3 -2
- data/lib/puppet/metatype/relationships.rb +1 -2
- data/lib/puppet/metatype/schedules.rb +0 -1
- data/lib/puppet/metatype/tags.rb +0 -1
- data/lib/puppet/module.rb +60 -32
- data/lib/puppet/network/authconfig.rb +0 -1
- data/lib/puppet/network/authorization.rb +0 -1
- data/lib/puppet/network/authstore.rb +0 -1
- data/lib/puppet/network/client.rb +13 -4
- data/lib/puppet/network/client/ca.rb +4 -5
- data/lib/puppet/network/client/dipper.rb +0 -1
- data/lib/puppet/network/client/file.rb +0 -1
- data/lib/puppet/network/client/master.rb +127 -235
- data/lib/puppet/network/client/proxy.rb +0 -1
- data/lib/puppet/network/client/report.rb +0 -1
- data/lib/puppet/network/client/resource.rb +0 -1
- data/lib/puppet/network/client/runner.rb +0 -1
- data/lib/puppet/network/client/status.rb +0 -1
- data/lib/puppet/network/client_request.rb +0 -1
- data/lib/puppet/network/handler.rb +5 -2
- data/lib/puppet/network/handler/ca.rb +1 -2
- data/lib/puppet/network/handler/configuration.rb +184 -0
- data/lib/puppet/network/handler/filebucket.rb +1 -2
- data/lib/puppet/network/handler/fileserver.rb +279 -107
- data/lib/puppet/network/handler/master.rb +57 -152
- data/lib/puppet/network/handler/report.rb +6 -65
- data/lib/puppet/network/handler/resource.rb +5 -13
- data/lib/puppet/network/handler/runner.rb +3 -4
- data/lib/puppet/network/handler/status.rb +0 -1
- data/lib/puppet/network/http.rb +13 -0
- data/lib/puppet/network/http/handler.rb +109 -0
- data/lib/puppet/network/http/mongrel.rb +54 -0
- data/lib/puppet/network/http/mongrel/rest.rb +37 -0
- data/lib/puppet/network/http/mongrel/xmlrpc.rb +4 -0
- data/lib/puppet/network/http/webrick.rb +51 -0
- data/lib/puppet/network/http/webrick/rest.rb +41 -0
- data/lib/puppet/network/http/webrick/xmlrpc.rb +4 -0
- data/lib/puppet/network/http_server.rb +3 -0
- data/lib/puppet/network/{server → http_server}/mongrel.rb +11 -5
- data/lib/puppet/network/{server → http_server}/webrick.rb +9 -5
- data/lib/puppet/network/rest_controller.rb +2 -0
- data/lib/puppet/network/rights.rb +0 -1
- data/lib/puppet/network/server.rb +63 -3
- data/lib/puppet/network/xmlrpc/client.rb +90 -23
- data/lib/puppet/network/xmlrpc/processor.rb +0 -1
- data/lib/puppet/network/xmlrpc/server.rb +0 -1
- data/lib/puppet/network/xmlrpc/webrick_servlet.rb +0 -1
- data/lib/puppet/node.rb +165 -0
- data/lib/puppet/node/catalog.rb +480 -0
- data/lib/puppet/node/environment.rb +46 -0
- data/lib/puppet/node/facts.rb +36 -0
- data/lib/puppet/parameter.rb +34 -28
- data/lib/puppet/parser/ast.rb +0 -1
- data/lib/puppet/parser/ast/astarray.rb +30 -53
- data/lib/puppet/parser/ast/branch.rb +0 -10
- data/lib/puppet/parser/ast/caseopt.rb +0 -11
- data/lib/puppet/parser/ast/casestatement.rb +0 -12
- data/lib/puppet/parser/ast/collection.rb +1 -3
- data/lib/puppet/parser/ast/collexpr.rb +0 -2
- data/lib/puppet/parser/ast/{component.rb → definition.rb} +58 -72
- data/lib/puppet/parser/ast/else.rb +0 -10
- data/lib/puppet/parser/ast/function.rb +0 -2
- data/lib/puppet/parser/ast/hostclass.rb +21 -19
- data/lib/puppet/parser/ast/ifstatement.rb +0 -13
- data/lib/puppet/parser/ast/leaf.rb +0 -8
- data/lib/puppet/parser/ast/node.rb +13 -10
- data/lib/puppet/parser/ast/resource.rb +75 -0
- data/lib/puppet/parser/ast/{resourcedefaults.rb → resource_defaults.rb} +4 -20
- data/lib/puppet/parser/ast/{resourceoverride.rb → resource_override.rb} +3 -5
- data/lib/puppet/parser/ast/resource_reference.rb +66 -0
- data/lib/puppet/parser/ast/resourceparam.rb +0 -14
- data/lib/puppet/parser/ast/selector.rb +0 -10
- data/lib/puppet/parser/ast/tag.rb +0 -2
- data/lib/puppet/parser/ast/vardef.rb +0 -14
- data/lib/puppet/parser/collector.rb +83 -101
- data/lib/puppet/parser/compile.rb +509 -0
- data/lib/puppet/parser/functions.rb +10 -10
- data/lib/puppet/parser/interpreter.rb +44 -662
- data/lib/puppet/parser/lexer.rb +1 -3
- data/lib/puppet/parser/parser.rb +674 -701
- data/lib/puppet/parser/parser_support.rb +33 -24
- data/lib/puppet/parser/resource.rb +219 -162
- data/lib/puppet/parser/resource/param.rb +1 -2
- data/lib/puppet/parser/resource/reference.rb +24 -16
- data/lib/puppet/parser/scope.rb +48 -459
- data/lib/puppet/parser/templatewrapper.rb +4 -5
- data/lib/puppet/pgraph.rb +10 -13
- data/lib/puppet/property.rb +25 -41
- data/lib/puppet/propertychange.rb +0 -2
- data/lib/puppet/provider.rb +15 -11
- data/lib/puppet/provider/cron/crontab.rb +6 -7
- data/lib/puppet/provider/group/groupadd.rb +0 -1
- data/lib/puppet/provider/group/netinfo.rb +0 -1
- data/lib/puppet/provider/group/pw.rb +0 -1
- data/lib/puppet/provider/host/netinfo.rb +0 -1
- data/lib/puppet/provider/host/parsed.rb +0 -1
- data/lib/puppet/provider/interface/redhat.rb +90 -91
- data/lib/puppet/provider/interface/sunos.rb +98 -81
- data/lib/puppet/provider/mailalias/aliases.rb +0 -1
- data/lib/puppet/provider/maillist/mailman.rb +2 -3
- data/lib/puppet/provider/mount.rb +10 -9
- data/lib/puppet/provider/mount/netinfo.rb +0 -1
- data/lib/puppet/provider/mount/parsed.rb +0 -1
- data/lib/puppet/provider/nameservice.rb +0 -1
- data/lib/puppet/provider/nameservice/netinfo.rb +0 -1
- data/lib/puppet/provider/nameservice/objectadd.rb +0 -1
- data/lib/puppet/provider/nameservice/pw.rb +0 -1
- data/lib/puppet/provider/package.rb +0 -2
- data/lib/puppet/provider/package/appdmg.rb +0 -1
- data/lib/puppet/provider/package/apple.rb +0 -1
- data/lib/puppet/provider/package/apt.rb +0 -1
- data/lib/puppet/provider/package/aptitude.rb +0 -1
- data/lib/puppet/provider/package/aptrpm.rb +0 -1
- data/lib/puppet/provider/package/blastwave.rb +0 -1
- data/lib/puppet/provider/package/darwinport.rb +0 -1
- data/lib/puppet/provider/package/dpkg.rb +9 -1
- data/lib/puppet/provider/package/fink.rb +0 -1
- data/lib/puppet/provider/package/freebsd.rb +0 -1
- data/lib/puppet/provider/package/gem.rb +0 -1
- data/lib/puppet/provider/package/openbsd.rb +1 -2
- data/lib/puppet/provider/package/pkgdmg.rb +14 -15
- data/lib/puppet/provider/package/portage.rb +6 -7
- data/lib/puppet/provider/package/ports.rb +1 -4
- data/lib/puppet/provider/package/rpm.rb +31 -45
- data/lib/puppet/provider/package/sun.rb +0 -3
- data/lib/puppet/provider/package/sunfreeware.rb +0 -1
- data/lib/puppet/provider/package/up2date.rb +0 -1
- data/lib/puppet/provider/package/urpmi.rb +0 -1
- data/lib/puppet/provider/package/yum.rb +45 -14
- data/lib/puppet/provider/package/yumhelper.py +37 -0
- data/lib/puppet/provider/parsedfile.rb +2 -3
- data/lib/puppet/provider/port/parsed.rb +0 -1
- data/lib/puppet/provider/service/base.rb +4 -1
- data/lib/puppet/provider/service/debian.rb +5 -2
- data/lib/puppet/provider/service/freebsd.rb +51 -0
- data/lib/puppet/provider/service/init.rb +16 -40
- data/lib/puppet/provider/service/redhat.rb +1 -6
- data/lib/puppet/provider/service/smf.rb +0 -1
- data/lib/puppet/provider/sshkey/parsed.rb +0 -1
- data/lib/puppet/provider/user/netinfo.rb +0 -1
- data/lib/puppet/provider/user/pw.rb +0 -1
- data/lib/puppet/provider/user/useradd.rb +0 -1
- data/lib/puppet/provider/zone/solaris.rb +0 -1
- data/lib/puppet/rails.rb +35 -30
- data/lib/puppet/rails/database/schema.rb +0 -1
- data/lib/puppet/rails/host.rb +6 -15
- data/lib/puppet/rails/param_name.rb +1 -2
- data/lib/puppet/rails/param_value.rb +0 -1
- data/lib/puppet/rails/puppet_class.rb +0 -1
- data/lib/puppet/rails/resource.rb +3 -5
- data/lib/puppet/reference/configuration.rb +12 -6
- data/lib/puppet/reference/indirection.rb +34 -0
- data/lib/puppet/reference/node_source.rb +9 -0
- data/lib/puppet/relationship.rb +10 -8
- data/lib/puppet/reports.rb +51 -0
- data/lib/puppet/reports/log.rb +2 -3
- data/lib/puppet/reports/rrdgraph.rb +2 -5
- data/lib/puppet/reports/store.rb +6 -7
- data/lib/puppet/reports/tagmail.rb +2 -3
- data/lib/puppet/resource_reference.rb +79 -0
- data/lib/puppet/simple_graph.rb +251 -0
- data/lib/puppet/sslcertificates.rb +19 -15
- data/lib/puppet/sslcertificates/ca.rb +56 -15
- data/lib/puppet/sslcertificates/certificate.rb +0 -1
- data/lib/puppet/sslcertificates/inventory.rb +2 -6
- data/lib/puppet/sslcertificates/monkey_patch.rb +6 -0
- data/lib/puppet/sslcertificates/support.rb +4 -5
- data/lib/puppet/transaction.rb +93 -96
- data/lib/puppet/transaction/report.rb +5 -1
- data/lib/puppet/transportable.rb +79 -125
- data/lib/puppet/type.rb +44 -10
- data/lib/puppet/type/component.rb +25 -110
- data/lib/puppet/type/cron.rb +1 -2
- data/lib/puppet/type/exec.rb +19 -13
- data/lib/puppet/type/group.rb +0 -1
- data/lib/puppet/type/host.rb +0 -1
- data/lib/puppet/type/interface.rb +6 -3
- data/lib/puppet/type/k5login.rb +87 -0
- data/lib/puppet/type/mailalias.rb +0 -1
- data/lib/puppet/type/maillist.rb +0 -1
- data/lib/puppet/type/mount.rb +7 -13
- data/lib/puppet/type/notify.rb +0 -1
- data/lib/puppet/type/package.rb +7 -63
- data/lib/puppet/type/pfile.rb +25 -32
- data/lib/puppet/type/pfile/checksum.rb +0 -1
- data/lib/puppet/type/pfile/content.rb +18 -3
- data/lib/puppet/type/pfile/ensure.rb +5 -6
- data/lib/puppet/type/pfile/group.rb +4 -1
- data/lib/puppet/type/pfile/mode.rb +0 -1
- data/lib/puppet/type/pfile/owner.rb +6 -9
- data/lib/puppet/type/pfile/source.rb +28 -11
- data/lib/puppet/type/pfile/target.rb +2 -1
- data/lib/puppet/type/pfile/type.rb +0 -1
- data/lib/puppet/type/pfilebucket.rb +0 -1
- data/lib/puppet/type/port.rb +0 -1
- data/lib/puppet/type/resources.rb +0 -1
- data/lib/puppet/type/schedule.rb +17 -15
- data/lib/puppet/type/service.rb +23 -159
- data/lib/puppet/type/sshkey.rb +0 -1
- data/lib/puppet/type/tidy.rb +15 -7
- data/lib/puppet/type/user.rb +0 -1
- data/lib/puppet/type/zone.rb +0 -1
- data/lib/puppet/util.rb +1 -2
- data/lib/puppet/util/autoload.rb +21 -23
- data/lib/puppet/util/checksums.rb +37 -0
- data/lib/puppet/util/classgen.rb +0 -1
- data/lib/puppet/util/diff.rb +71 -0
- data/lib/puppet/util/docs.rb +8 -2
- data/lib/puppet/util/errors.rb +0 -1
- data/lib/puppet/util/execution.rb +0 -1
- data/lib/puppet/util/fact_store.rb +0 -1
- data/lib/puppet/util/feature.rb +31 -22
- data/lib/puppet/util/fileparsing.rb +3 -2
- data/lib/puppet/util/filetype.rb +30 -12
- data/lib/puppet/util/graph.rb +0 -1
- data/lib/puppet/util/inifile.rb +0 -1
- data/lib/puppet/util/instance_loader.rb +11 -4
- data/lib/puppet/util/loadedfile.rb +0 -1
- data/lib/puppet/util/log.rb +0 -1
- data/lib/puppet/util/log_paths.rb +0 -1
- data/lib/puppet/util/logging.rb +0 -1
- data/lib/puppet/util/metaid.rb +0 -1
- data/lib/puppet/util/methodhelper.rb +0 -2
- data/lib/puppet/util/metric.rb +1 -2
- data/lib/puppet/util/plist.rb +0 -1
- data/lib/puppet/util/plist/generator.rb +0 -1
- data/lib/puppet/util/plist/parser.rb +0 -1
- data/lib/puppet/util/posix.rb +7 -1
- data/lib/puppet/util/provider_features.rb +11 -12
- data/lib/puppet/util/rails/collection_merger.rb +0 -1
- data/lib/puppet/util/reference.rb +2 -3
- data/lib/puppet/util/{config.rb → settings.rb} +424 -300
- data/lib/puppet/util/storage.rb +1 -3
- data/lib/puppet/util/subclass_loader.rb +0 -1
- data/lib/puppet/util/suidmanager.rb +25 -42
- data/lib/puppet/util/uri_helper.rb +22 -0
- data/lib/puppet/util/variables.rb +0 -1
- data/lib/puppet/util/warnings.rb +0 -1
- data/test/Rakefile +1 -1
- data/test/certmgr/ca.rb +8 -2
- data/test/certmgr/certmgr.rb +14 -6
- data/test/certmgr/inventory.rb +18 -30
- data/test/certmgr/support.rb +3 -2
- data/test/executables/filebucket.rb +1 -2
- data/test/executables/puppetbin.rb +1 -2
- data/test/executables/puppetca.rb +7 -2
- data/test/executables/puppetd.rb +23 -29
- data/test/executables/puppetmasterd.rb +1 -2
- data/test/executables/puppetmodule.rb +1 -2
- data/test/language/ast.rb +24 -29
- data/test/language/ast/casestatement.rb +1 -2
- data/test/language/ast/definition.rb +166 -0
- data/test/language/ast/hostclass.rb +50 -29
- data/test/language/ast/resource.rb +59 -0
- data/test/language/ast/{resourceref.rb → resource_reference.rb} +30 -20
- data/test/language/ast/selector.rb +1 -2
- data/test/language/ast/variable.rb +1 -2
- data/test/language/compile.rb +569 -0
- data/test/language/functions.rb +57 -76
- data/test/language/lexer.rb +20 -3
- data/test/language/parser.rb +45 -33
- data/test/language/resource.rb +275 -308
- data/test/language/scope.rb +135 -410
- data/test/language/snippets.rb +19 -41
- data/test/language/transportable.rb +8 -29
- data/test/lib/mocha/auto_verify.rb +6 -6
- data/test/lib/mocha/deprecation.rb +22 -0
- data/test/lib/mocha/exception_raiser.rb +17 -0
- data/test/lib/mocha/expectation.rb +167 -84
- data/test/lib/mocha/infinite_range.rb +4 -6
- data/test/lib/mocha/inspect.rb +3 -1
- data/test/lib/mocha/is_a.rb +9 -0
- data/test/lib/mocha/missing_expectation.rb +27 -0
- data/test/lib/mocha/mock.rb +192 -5
- data/test/lib/mocha/multiple_yields.rb +20 -0
- data/test/lib/mocha/no_yields.rb +11 -0
- data/test/lib/mocha/object.rb +11 -1
- data/test/lib/mocha/parameter_matchers.rb +9 -0
- data/test/lib/mocha/parameter_matchers/all_of.rb +39 -0
- data/test/lib/mocha/parameter_matchers/any_of.rb +44 -0
- data/test/lib/mocha/parameter_matchers/anything.rb +30 -0
- data/test/lib/mocha/parameter_matchers/has_entry.rb +39 -0
- data/test/lib/mocha/parameter_matchers/has_key.rb +39 -0
- data/test/lib/mocha/parameter_matchers/has_value.rb +39 -0
- data/test/lib/mocha/parameter_matchers/includes.rb +37 -0
- data/test/lib/mocha/return_values.rb +31 -0
- data/test/lib/mocha/single_return_value.rb +24 -0
- data/test/lib/mocha/single_yield.rb +18 -0
- data/test/lib/mocha/standalone.rb +2 -0
- data/test/lib/mocha/stub.rb +18 -0
- data/test/lib/mocha/test_case_adapter.rb +3 -3
- data/test/lib/mocha/yield_parameters.rb +31 -0
- data/test/lib/puppettest.rb +38 -20
- data/test/lib/puppettest/certificates.rb +0 -1
- data/test/lib/puppettest/exetest.rb +0 -1
- data/test/lib/puppettest/fakes.rb +0 -1
- data/test/lib/puppettest/fileparsing.rb +8 -15
- data/test/lib/puppettest/filetesting.rb +0 -1
- data/test/lib/puppettest/parsertesting.rb +37 -23
- data/test/lib/puppettest/railstesting.rb +3 -6
- data/test/lib/puppettest/reporttesting.rb +0 -1
- data/test/lib/puppettest/resourcetesting.rb +6 -34
- data/test/lib/puppettest/runnable_test.rb +30 -0
- data/test/lib/puppettest/servertest.rb +2 -3
- data/test/lib/puppettest/support/assertions.rb +13 -41
- data/test/lib/puppettest/support/collection.rb +0 -1
- data/test/lib/puppettest/support/helpers.rb +0 -1
- data/test/lib/puppettest/support/resources.rb +17 -17
- data/test/lib/puppettest/support/utils.rb +45 -27
- data/test/lib/puppettest/testcase.rb +2 -21
- data/test/lib/rake/puppet_test_loader.rb +0 -1
- data/test/lib/rake/puppet_testtask.rb +0 -1
- data/test/network/authconfig.rb +1 -2
- data/test/network/authorization.rb +1 -2
- data/test/network/authstore.rb +1 -2
- data/test/network/client/ca.rb +12 -7
- data/test/network/client/client.rb +17 -22
- data/test/network/client/dipper.rb +1 -2
- data/test/network/client/master.rb +70 -184
- data/test/network/client/resource.rb +9 -2
- data/test/network/client_request.rb +1 -2
- data/test/network/daemon.rb +1 -2
- data/test/network/handler/bucket.rb +2 -31
- data/test/network/handler/ca.rb +9 -3
- data/test/network/handler/configuration.rb +160 -0
- data/test/network/handler/fileserver.rb +24 -5
- data/test/network/handler/handler.rb +1 -2
- data/test/network/handler/master.rb +38 -243
- data/test/network/handler/report.rb +2 -104
- data/test/network/handler/resource.rb +5 -3
- data/test/network/handler/runner.rb +22 -60
- data/test/network/rights.rb +1 -2
- data/test/network/server/mongrel_test.rb +2 -3
- data/test/network/server/webrick.rb +17 -11
- data/test/network/xmlrpc/client.rb +27 -12
- data/test/network/xmlrpc/processor.rb +3 -4
- data/test/network/xmlrpc/server.rb +1 -2
- data/test/network/xmlrpc/webrick_servlet.rb +8 -2
- data/test/other/dsl.rb +2 -4
- data/test/other/events.rb +14 -56
- data/test/other/overrides.rb +3 -6
- data/test/other/propertychange.rb +1 -2
- data/test/other/provider.rb +1 -2
- data/test/other/puppet.rb +1 -2
- data/test/other/relationships.rb +15 -17
- data/test/other/report.rb +14 -20
- data/test/other/transactions.rb +109 -192
- data/test/puppet/conffiles.rb +3 -5
- data/test/puppet/defaults.rb +1 -28
- data/test/puppet/errortest.rb +1 -2
- data/test/puppet/tc_suidmanager.rb +77 -63
- data/test/rails/ast.rb +4 -4
- data/test/rails/configuration.rb +71 -0
- data/test/rails/host.rb +19 -30
- data/test/rails/rails.rb +1 -2
- data/test/rails/railsparameter.rb +3 -4
- data/test/rails/railsresource.rb +6 -5
- data/test/ral/manager/attributes.rb +1 -2
- data/test/ral/manager/instances.rb +3 -3
- data/test/ral/manager/manager.rb +1 -2
- data/test/ral/manager/provider.rb +1 -2
- data/test/ral/manager/type.rb +89 -93
- data/test/ral/providers/cron/crontab.rb +9 -11
- data/test/ral/providers/group.rb +1 -2
- data/test/ral/providers/host/netinfo.rb +1 -2
- data/test/ral/providers/host/parsed.rb +1 -2
- data/test/ral/providers/mailalias/aliases.rb +1 -2
- data/test/ral/providers/mount/netinfo.rb +1 -2
- data/test/ral/providers/nameservice.rb +1 -2
- data/test/ral/providers/package.rb +5 -4
- data/test/ral/providers/package/apt.rb +0 -1
- data/test/ral/providers/package/aptrpm.rb +0 -1
- data/test/ral/providers/parsedfile.rb +1 -2
- data/test/ral/providers/port/parsed.rb +1 -2
- data/test/ral/providers/provider.rb +10 -5
- data/test/ral/providers/service/base.rb +1 -2
- data/test/ral/providers/service/debian.rb +58 -0
- data/test/ral/providers/sshkey/parsed.rb +1 -2
- data/test/ral/providers/user.rb +3 -2
- data/test/ral/providers/user/useradd.rb +0 -1
- data/test/ral/types/basic.rb +4 -9
- data/test/ral/types/cron.rb +6 -12
- data/test/ral/types/exec.rb +6 -7
- data/test/ral/types/file.rb +35 -14
- data/test/ral/types/file/target.rb +6 -5
- data/test/ral/types/filebucket.rb +3 -2
- data/test/ral/types/fileignoresource.rb +10 -42
- data/test/ral/types/filesources.rb +21 -60
- data/test/ral/types/group.rb +3 -3
- data/test/ral/types/host.rb +6 -3
- data/test/ral/types/mailalias.rb +1 -2
- data/test/ral/types/parameter.rb +5 -3
- data/test/ral/types/port.rb +1 -2
- data/test/ral/types/property.rb +3 -3
- data/test/ral/types/resources.rb +1 -2
- data/test/ral/types/service.rb +5 -3
- data/test/ral/types/sshkey.rb +5 -3
- data/test/ral/types/tidy.rb +63 -3
- data/test/ral/types/user.rb +10 -11
- data/test/ral/types/yumrepo.rb +1 -1
- data/test/ral/types/zone.rb +1 -2
- data/test/util/autoload.rb +23 -27
- data/test/util/classgen.rb +1 -2
- data/test/util/execution.rb +1 -2
- data/test/util/features.rb +1 -3
- data/test/util/fileparsing.rb +11 -3
- data/test/util/filetype.rb +1 -2
- data/test/util/inifile.rb +1 -1
- data/test/util/instance_loader.rb +5 -6
- data/test/util/loadedfile.rb +1 -2
- data/test/util/log.rb +1 -2
- data/test/util/metrics.rb +1 -2
- data/test/util/package.rb +1 -2
- data/test/util/posixtest.rb +1 -2
- data/test/util/{config.rb → settings.rb} +123 -265
- data/test/util/storage.rb +1 -2
- data/test/util/subclass_loader.rb +1 -2
- data/test/util/utiltest.rb +1 -111
- metadata +130 -112
- data/ext/tools/passwd2puppet +0 -45
- data/lib/puppet/fact_stores/yaml.rb +0 -42
- data/lib/puppet/network/handler/facts.rb +0 -70
- data/lib/puppet/parser/ast/resourcedef.rb +0 -222
- data/lib/puppet/parser/ast/resourceref.rb +0 -58
- data/test/language/ast/component.rb +0 -142
- data/test/language/collector.rb +0 -179
- data/test/language/interpreter.rb +0 -804
- data/test/language/node.rb +0 -126
- data/test/lib/mocha/mock_methods.rb +0 -122
- data/test/lib/puppettest/graph.rb +0 -41
- data/test/lib/spec.rb +0 -8
- data/test/lib/spec/callback.rb +0 -11
- data/test/lib/spec/callback/callback_container.rb +0 -60
- data/test/lib/spec/callback/extensions/module.rb +0 -24
- data/test/lib/spec/callback/extensions/object.rb +0 -37
- data/test/lib/spec/deprecated.rb +0 -3
- data/test/lib/spec/expectations.rb +0 -59
- data/test/lib/spec/expectations/differs/default.rb +0 -62
- data/test/lib/spec/expectations/errors.rb +0 -6
- data/test/lib/spec/expectations/extensions.rb +0 -3
- data/test/lib/spec/expectations/extensions/object.rb +0 -109
- data/test/lib/spec/expectations/extensions/proc.rb +0 -57
- data/test/lib/spec/expectations/extensions/string_and_symbol.rb +0 -17
- data/test/lib/spec/expectations/handler.rb +0 -47
- data/test/lib/spec/expectations/should.rb +0 -5
- data/test/lib/spec/expectations/should/base.rb +0 -64
- data/test/lib/spec/expectations/should/change.rb +0 -69
- data/test/lib/spec/expectations/should/have.rb +0 -128
- data/test/lib/spec/expectations/should/not.rb +0 -74
- data/test/lib/spec/expectations/should/should.rb +0 -81
- data/test/lib/spec/expectations/sugar.rb +0 -47
- data/test/lib/spec/matchers.rb +0 -160
- data/test/lib/spec/matchers/be.rb +0 -161
- data/test/lib/spec/matchers/be_close.rb +0 -37
- data/test/lib/spec/matchers/change.rb +0 -120
- data/test/lib/spec/matchers/eql.rb +0 -43
- data/test/lib/spec/matchers/equal.rb +0 -43
- data/test/lib/spec/matchers/has.rb +0 -44
- data/test/lib/spec/matchers/have.rb +0 -140
- data/test/lib/spec/matchers/include.rb +0 -50
- data/test/lib/spec/matchers/match.rb +0 -41
- data/test/lib/spec/matchers/raise_error.rb +0 -100
- data/test/lib/spec/matchers/respond_to.rb +0 -35
- data/test/lib/spec/matchers/satisfy.rb +0 -47
- data/test/lib/spec/matchers/throw_symbol.rb +0 -75
- data/test/lib/spec/mocks.rb +0 -232
- data/test/lib/spec/mocks/argument_expectation.rb +0 -132
- data/test/lib/spec/mocks/error_generator.rb +0 -85
- data/test/lib/spec/mocks/errors.rb +0 -10
- data/test/lib/spec/mocks/extensions/object.rb +0 -3
- data/test/lib/spec/mocks/message_expectation.rb +0 -231
- data/test/lib/spec/mocks/methods.rb +0 -40
- data/test/lib/spec/mocks/mock.rb +0 -26
- data/test/lib/spec/mocks/mock_handler.rb +0 -166
- data/test/lib/spec/mocks/order_group.rb +0 -29
- data/test/lib/spec/rake/spectask.rb +0 -173
- data/test/lib/spec/rake/verify_rcov.rb +0 -47
- data/test/lib/spec/runner.rb +0 -132
- data/test/lib/spec/runner/backtrace_tweaker.rb +0 -55
- data/test/lib/spec/runner/command_line.rb +0 -34
- data/test/lib/spec/runner/context.rb +0 -154
- data/test/lib/spec/runner/context_eval.rb +0 -142
- data/test/lib/spec/runner/context_runner.rb +0 -55
- data/test/lib/spec/runner/drb_command_line.rb +0 -21
- data/test/lib/spec/runner/execution_context.rb +0 -17
- data/test/lib/spec/runner/extensions/kernel.rb +0 -17
- data/test/lib/spec/runner/extensions/object.rb +0 -32
- data/test/lib/spec/runner/formatter.rb +0 -5
- data/test/lib/spec/runner/formatter/base_text_formatter.rb +0 -118
- data/test/lib/spec/runner/formatter/html_formatter.rb +0 -219
- data/test/lib/spec/runner/formatter/progress_bar_formatter.rb +0 -27
- data/test/lib/spec/runner/formatter/rdoc_formatter.rb +0 -22
- data/test/lib/spec/runner/formatter/specdoc_formatter.rb +0 -23
- data/test/lib/spec/runner/heckle_runner.rb +0 -71
- data/test/lib/spec/runner/heckle_runner_win.rb +0 -10
- data/test/lib/spec/runner/option_parser.rb +0 -224
- data/test/lib/spec/runner/reporter.rb +0 -105
- data/test/lib/spec/runner/spec_matcher.rb +0 -25
- data/test/lib/spec/runner/spec_parser.rb +0 -41
- data/test/lib/spec/runner/spec_should_raise_handler.rb +0 -74
- data/test/lib/spec/runner/specification.rb +0 -114
- data/test/lib/spec/translator.rb +0 -87
- data/test/lib/spec/version.rb +0 -30
- data/test/network/handler/facts.rb +0 -112
- data/test/other/pgraph.rb +0 -290
- data/test/other/relationship.rb +0 -74
- data/test/puppet/modules.rb +0 -59
- data/test/rails/collection.rb +0 -247
- data/test/rails/interpreter.rb +0 -91
- data/test/ral/providers/mount/parsed.rb +0 -251
- data/test/ral/providers/service.rb +0 -235
- data/test/ral/types/component.rb +0 -113
- data/test/ral/types/interface.rb +0 -40
- data/test/ral/types/mount.rb +0 -362
- data/test/ral/types/package.rb +0 -154
- data/test/ral/types/schedule.rb +0 -357
- data/test/tagging/tagging.rb +0 -170
- data/test/util/fact_store.rb +0 -67
- data/test/util/graph.rb +0 -108
data/test/ral/types/component.rb
DELETED
@@ -1,113 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
|
4
|
-
|
5
|
-
require 'puppettest'
|
6
|
-
require 'puppettest/support/resources'
|
7
|
-
|
8
|
-
# $Id: component.rb 2170 2007-02-07 17:21:52Z luke $
|
9
|
-
|
10
|
-
class TestComponent < Test::Unit::TestCase
|
11
|
-
include PuppetTest
|
12
|
-
include PuppetTest::Support::Resources
|
13
|
-
def setup
|
14
|
-
super
|
15
|
-
@@used = {}
|
16
|
-
@type = Puppet::Type::Component
|
17
|
-
@file = Puppet::Type.type(:file)
|
18
|
-
end
|
19
|
-
|
20
|
-
def randnum(limit)
|
21
|
-
num = nil
|
22
|
-
looped = 0
|
23
|
-
loop do
|
24
|
-
looped += 1
|
25
|
-
if looped > 2000
|
26
|
-
raise "Reached limit of looping"
|
27
|
-
break
|
28
|
-
end
|
29
|
-
num = rand(limit)
|
30
|
-
unless @@used.include?(num)
|
31
|
-
@@used[num] = true
|
32
|
-
break
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
num
|
37
|
-
end
|
38
|
-
|
39
|
-
def mkfile(num = nil)
|
40
|
-
unless num
|
41
|
-
num = randnum(1000)
|
42
|
-
end
|
43
|
-
name = tempfile() + num.to_s
|
44
|
-
|
45
|
-
file = Puppet.type(:file).create(
|
46
|
-
:path => name,
|
47
|
-
:checksum => "md5"
|
48
|
-
)
|
49
|
-
@@tmpfiles << name
|
50
|
-
file
|
51
|
-
end
|
52
|
-
|
53
|
-
def mkcomp
|
54
|
-
Puppet.type(:component).create(:name => "component_" + randnum(1000).to_s)
|
55
|
-
end
|
56
|
-
|
57
|
-
def mkrandcomp(numfiles, numdivs)
|
58
|
-
comp = mkcomp
|
59
|
-
hash = {}
|
60
|
-
found = 0
|
61
|
-
|
62
|
-
divs = {}
|
63
|
-
|
64
|
-
numdivs.times { |i|
|
65
|
-
num = i + 2
|
66
|
-
divs[num] = nil
|
67
|
-
}
|
68
|
-
while found < numfiles
|
69
|
-
num = randnum(numfiles)
|
70
|
-
found += 1
|
71
|
-
f = mkfile(num)
|
72
|
-
hash[f.name] = f
|
73
|
-
reqd = []
|
74
|
-
divs.each { |n,obj|
|
75
|
-
if rand(50) % n == 0
|
76
|
-
if obj
|
77
|
-
unless reqd.include?(obj.object_id)
|
78
|
-
f[:require] = [[obj.class.name, obj.name]]
|
79
|
-
reqd << obj.object_id
|
80
|
-
end
|
81
|
-
end
|
82
|
-
end
|
83
|
-
|
84
|
-
divs[n] = f
|
85
|
-
}
|
86
|
-
end
|
87
|
-
|
88
|
-
hash.each { |name, obj|
|
89
|
-
comp.push obj
|
90
|
-
}
|
91
|
-
|
92
|
-
comp.finalize
|
93
|
-
comp
|
94
|
-
end
|
95
|
-
|
96
|
-
def test_to_graph
|
97
|
-
one, two, middle, top = mktree
|
98
|
-
|
99
|
-
graph = nil
|
100
|
-
assert_nothing_raised do
|
101
|
-
graph = top.to_graph
|
102
|
-
end
|
103
|
-
|
104
|
-
assert(graph.is_a?(Puppet::PGraph), "result is not a pgraph")
|
105
|
-
|
106
|
-
[one, two, middle, top].each do |comp|
|
107
|
-
comp.each do |child|
|
108
|
-
assert(graph.edge?(comp, child),
|
109
|
-
"Did not create edge from %s => %s" % [comp.name, child.name])
|
110
|
-
end
|
111
|
-
end
|
112
|
-
end
|
113
|
-
end
|
data/test/ral/types/interface.rb
DELETED
@@ -1,40 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
|
4
|
-
|
5
|
-
require 'puppettest'
|
6
|
-
require 'mocha'
|
7
|
-
|
8
|
-
class TestInterfaceType < PuppetTest::TestCase
|
9
|
-
confine "Could not find suitable interface provider" => Puppet::Type.type(:interface).suitableprovider.length > 0
|
10
|
-
|
11
|
-
def setup
|
12
|
-
super
|
13
|
-
@type = Puppet::Type.type(:interface)
|
14
|
-
end
|
15
|
-
|
16
|
-
def test_prefetch
|
17
|
-
interface = @type.create(:name => "127.0.0.1", :interface => "lo0", :check => :all)
|
18
|
-
|
19
|
-
@type.suitableprovider.each do |provider|
|
20
|
-
assert_nothing_raised("Could not prefetch interfaces from %s provider" % provider.name) do
|
21
|
-
provider.prefetch("eth0" => interface)
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
def test_instances
|
27
|
-
@type.suitableprovider.each do |provider|
|
28
|
-
list = nil
|
29
|
-
assert_nothing_raised("Could not get instance list from %s" % provider.name) do
|
30
|
-
list = provider.instances
|
31
|
-
end
|
32
|
-
assert(list.length > 0, "Did not get any instances from %s" % provider.name)
|
33
|
-
list.each do |interface|
|
34
|
-
assert_instance_of(provider, interface, "%s provider returned something other than a provider instance" % provider.name)
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
# $Id: interface.rb 2750 2007-08-06 17:59:37Z luke $
|
data/test/ral/types/mount.rb
DELETED
@@ -1,362 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
|
4
|
-
|
5
|
-
require 'puppettest'
|
6
|
-
require 'mocha'
|
7
|
-
|
8
|
-
unless Facter.value(:operatingsystem) == "Darwin"
|
9
|
-
class TestMounts < PuppetTest::TestCase
|
10
|
-
include PuppetTest
|
11
|
-
|
12
|
-
p = Puppet::Type.type(:mount).provide :fake, :parent => PuppetTest::FakeParsedProvider do
|
13
|
-
@name = :fake
|
14
|
-
apimethods :ensure
|
15
|
-
|
16
|
-
attr_accessor :mounted
|
17
|
-
|
18
|
-
def self.default_target
|
19
|
-
:yayness
|
20
|
-
end
|
21
|
-
|
22
|
-
def self.instances
|
23
|
-
[]
|
24
|
-
end
|
25
|
-
|
26
|
-
def create
|
27
|
-
@ensure = :present
|
28
|
-
@resource.class.validproperties.each do |property|
|
29
|
-
if value = @resource.should(property)
|
30
|
-
self.send(property.to_s + "=", value)
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
def destroy
|
36
|
-
@ensure = :absent
|
37
|
-
end
|
38
|
-
|
39
|
-
def exists?
|
40
|
-
if defined? @ensure and @ensure == :present
|
41
|
-
true
|
42
|
-
else
|
43
|
-
false
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
def mounted?
|
48
|
-
@ensure == :mounted
|
49
|
-
end
|
50
|
-
|
51
|
-
def mount
|
52
|
-
@ensure = :mounted
|
53
|
-
end
|
54
|
-
|
55
|
-
def remount
|
56
|
-
end
|
57
|
-
|
58
|
-
def unmount
|
59
|
-
@ensure = :present
|
60
|
-
end
|
61
|
-
end
|
62
|
-
|
63
|
-
FakeMountProvider = p
|
64
|
-
|
65
|
-
@@fakeproviders[:mount] = p
|
66
|
-
|
67
|
-
def setup
|
68
|
-
super
|
69
|
-
@mount = Puppet::Type.type(:mount)
|
70
|
-
@realprovider = @mount.defaultprovider
|
71
|
-
@mount.defaultprovider = FakeMountProvider
|
72
|
-
end
|
73
|
-
|
74
|
-
def teardown
|
75
|
-
Puppet.type(:mount).clear
|
76
|
-
if @realprovider.respond_to?(:clear)
|
77
|
-
@realprovider.clear
|
78
|
-
end
|
79
|
-
Puppet::Type.type(:mount).defaultprovider = nil
|
80
|
-
super
|
81
|
-
end
|
82
|
-
|
83
|
-
def mkmount
|
84
|
-
mount = nil
|
85
|
-
|
86
|
-
assert_nothing_raised {
|
87
|
-
mount = Puppet.type(:mount).create(mkmount_args)
|
88
|
-
}
|
89
|
-
|
90
|
-
return mount
|
91
|
-
end
|
92
|
-
|
93
|
-
def mkmount_args
|
94
|
-
if defined? @pcount
|
95
|
-
@pcount += 1
|
96
|
-
else
|
97
|
-
@pcount = 1
|
98
|
-
end
|
99
|
-
args = {
|
100
|
-
:name => "/fspuppet%s" % @pcount,
|
101
|
-
:device => "/dev/dsk%s" % @pcount,
|
102
|
-
}
|
103
|
-
|
104
|
-
[@mount.validproperties, @mount.parameters].flatten.each do |field|
|
105
|
-
next if [:path, :provider, :target, :ensure, :remounts].include?(field)
|
106
|
-
unless args.include? field
|
107
|
-
args[field] = "fake%s" % @pcount
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
return args
|
112
|
-
end
|
113
|
-
|
114
|
-
def test_simplemount
|
115
|
-
mount = mkmount
|
116
|
-
mount[:ensure] = :mounted
|
117
|
-
|
118
|
-
assert_apply(mount)
|
119
|
-
mount.send(:properties).each do |property|
|
120
|
-
assert_equal(property.should, mount.provider.send(property.name),
|
121
|
-
"%s was not set to %s" % [property.name, property.should])
|
122
|
-
end
|
123
|
-
assert_events([], mount)
|
124
|
-
|
125
|
-
assert_nothing_raised { mount.retrieve }
|
126
|
-
|
127
|
-
# Now modify a field
|
128
|
-
mount[:dump] = 2
|
129
|
-
mount[:options] = "defaults,ro"
|
130
|
-
|
131
|
-
assert_events([:mount_changed,:mount_changed, :triggered], mount)
|
132
|
-
assert_equal(2, mount.provider.dump, "Changes did not get flushed")
|
133
|
-
assert_equal("defaults,ro", mount.provider.options, "Changes did not get flushed")
|
134
|
-
|
135
|
-
# Now modify a field in addition to change :ensure.
|
136
|
-
mount[:ensure] = :present
|
137
|
-
mount[:options] = "defaults"
|
138
|
-
|
139
|
-
assert_apply(mount)
|
140
|
-
assert(! mount.provider.mounted?, "mount was still mounted")
|
141
|
-
assert_equal("defaults", mount.provider.options)
|
142
|
-
|
143
|
-
# Now remount it and make sure changes get flushed then, too.
|
144
|
-
mount[:ensure] = :mounted
|
145
|
-
mount[:options] = "aftermount"
|
146
|
-
|
147
|
-
assert_apply(mount)
|
148
|
-
assert(mount.provider.mounted?, "mount was not mounted")
|
149
|
-
assert_equal("aftermount", mount.provider.options)
|
150
|
-
end
|
151
|
-
|
152
|
-
# Make sure fs mounting behaves appropriately. This is more a test of
|
153
|
-
# whether things get mounted and unmounted based on the value of 'ensure'.
|
154
|
-
def test_mountfs
|
155
|
-
obj = mkmount
|
156
|
-
|
157
|
-
assert_apply(obj)
|
158
|
-
|
159
|
-
# Verify we can remove the mount
|
160
|
-
assert_nothing_raised {
|
161
|
-
obj[:ensure] = :absent
|
162
|
-
}
|
163
|
-
|
164
|
-
assert_events([:mount_deleted], obj)
|
165
|
-
assert_events([], obj)
|
166
|
-
|
167
|
-
# And verify it's gone
|
168
|
-
assert(!obj.provider.mounted?, "Object is mounted after being removed")
|
169
|
-
|
170
|
-
assert_nothing_raised {
|
171
|
-
obj[:ensure] = :present
|
172
|
-
}
|
173
|
-
|
174
|
-
assert_events([:mount_created, :triggered], obj)
|
175
|
-
assert_events([], obj)
|
176
|
-
|
177
|
-
assert(! obj.provider.mounted?, "Object is mounted incorrectly")
|
178
|
-
|
179
|
-
assert_nothing_raised {
|
180
|
-
obj[:ensure] = :mounted
|
181
|
-
}
|
182
|
-
|
183
|
-
assert_events([:mount_mounted, :triggered], obj)
|
184
|
-
assert_events([], obj)
|
185
|
-
|
186
|
-
current_values = nil
|
187
|
-
assert_nothing_raised { current_values = obj.retrieve }
|
188
|
-
assert_equal(:mounted, current_values[obj.property(:ensure)])
|
189
|
-
|
190
|
-
assert_nothing_raised { current_values = obj.retrieve }
|
191
|
-
assert(obj.provider.mounted?, "Object is not mounted")
|
192
|
-
end
|
193
|
-
|
194
|
-
def test_defaults
|
195
|
-
obj = mkmount
|
196
|
-
args = mkmount_args
|
197
|
-
args.delete(:pass)
|
198
|
-
args.delete(:dump)
|
199
|
-
mount = nil
|
200
|
-
|
201
|
-
assert_nothing_raised {
|
202
|
-
mount = Puppet.type(:mount).create(args)
|
203
|
-
}
|
204
|
-
|
205
|
-
assert_equal(0, mount.should(:pass), "Did not set default for pass")
|
206
|
-
assert_equal(0, mount.should(:dump), "Did not set default for dump")
|
207
|
-
end
|
208
|
-
|
209
|
-
# Darwin doesn't put its mount table into netinfo
|
210
|
-
unless Facter.value(:operatingsystem) == "Darwin"
|
211
|
-
def test_instances
|
212
|
-
instances = nil
|
213
|
-
assert(@mount.respond_to?(:instances),
|
214
|
-
"No instances method defined for mount")
|
215
|
-
|
216
|
-
assert_nothing_raised do
|
217
|
-
instances = Puppet::Type.type(:mount).instances
|
218
|
-
end
|
219
|
-
|
220
|
-
assert(instances.length > 0, "Did not return any mounts")
|
221
|
-
|
222
|
-
root = instances.find { |o| o[:name] == "/" }
|
223
|
-
assert(root, "Could not find root root filesystem in instances results")
|
224
|
-
|
225
|
-
current_values = nil
|
226
|
-
assert_nothing_raised do
|
227
|
-
current_values = root.retrieve
|
228
|
-
end
|
229
|
-
|
230
|
-
assert(current_values[root.property(:device)], "Device was not set")
|
231
|
-
end
|
232
|
-
end
|
233
|
-
|
234
|
-
# Make sure we actually remove the object from the file and such.
|
235
|
-
# Darwin will actually write to netinfo here.
|
236
|
-
if Facter.value(:operatingsystem) != "Darwin" or Process.uid == 0
|
237
|
-
def test_removal
|
238
|
-
# Reset the provider so that we're using the real thing
|
239
|
-
@mount.defaultprovider = nil
|
240
|
-
|
241
|
-
provider = @mount.defaultprovider
|
242
|
-
assert(provider, "Could not retrieve default provider")
|
243
|
-
|
244
|
-
if provider.respond_to?(:default_target)
|
245
|
-
file = provider.default_target
|
246
|
-
assert(FileTest.exists?(file),
|
247
|
-
"FSTab %s does not exist" % file)
|
248
|
-
|
249
|
-
# Now switch to ram, so we're just doing this there, not really on disk.
|
250
|
-
oldtype = provider.filetype
|
251
|
-
provider.filetype = :ram
|
252
|
-
cleanup { provider.filetype = oldtype }
|
253
|
-
#provider.target_object(file).write text
|
254
|
-
end
|
255
|
-
|
256
|
-
mount = mkmount
|
257
|
-
|
258
|
-
mount[:ensure] = :present
|
259
|
-
|
260
|
-
assert_events([:mount_created, :triggered], mount)
|
261
|
-
assert_events([], mount)
|
262
|
-
|
263
|
-
mount[:ensure] = :absent
|
264
|
-
assert_events([:mount_deleted], mount)
|
265
|
-
assert_events([], mount)
|
266
|
-
|
267
|
-
# Now try listing and making sure the object is actually gone.
|
268
|
-
instances = mount.provider.class.instances
|
269
|
-
assert(! instances.find { |r| r[:name] == mount[:name] },
|
270
|
-
"Mount was not actually removed")
|
271
|
-
end
|
272
|
-
end
|
273
|
-
|
274
|
-
# Make sure that the name gets correctly set if they set the path,
|
275
|
-
# which used to be the namevar.
|
276
|
-
def test_name_and_path
|
277
|
-
mount = nil
|
278
|
-
args = mkmount_args
|
279
|
-
args[:name] = "mount_name"
|
280
|
-
args[:path] = "mount_path"
|
281
|
-
|
282
|
-
assert_nothing_raised do
|
283
|
-
mount = @mount.create(args)
|
284
|
-
end
|
285
|
-
|
286
|
-
assert_equal("mount_path", mount[:name], "Name did not get copied over")
|
287
|
-
end
|
288
|
-
|
289
|
-
def test_refresh
|
290
|
-
mount = mkmount
|
291
|
-
mount[:ensure] = :mounted
|
292
|
-
|
293
|
-
remounted = false
|
294
|
-
mount.provider.meta_def(:remount) do
|
295
|
-
remounted = true
|
296
|
-
end
|
297
|
-
|
298
|
-
# First make sure we correctly call the provider
|
299
|
-
assert_nothing_raised do
|
300
|
-
mount.refresh
|
301
|
-
end
|
302
|
-
assert(remounted, "did not call remount on provider")
|
303
|
-
|
304
|
-
# then make sure it gets called during transactions
|
305
|
-
remounted = false
|
306
|
-
mount[:device] = "/dev/yayness"
|
307
|
-
|
308
|
-
assert_apply(mount)
|
309
|
-
|
310
|
-
assert(remounted, "did not remount when mount changed")
|
311
|
-
|
312
|
-
# Now make sure it doesn't remount if the mount is just 'present'
|
313
|
-
mount[:ensure] = :present
|
314
|
-
mount[:device] = "/dev/funtest"
|
315
|
-
remounted = false
|
316
|
-
assert_apply(mount)
|
317
|
-
|
318
|
-
assert(! remounted, "remounted even though not supposed to be mounted")
|
319
|
-
end
|
320
|
-
|
321
|
-
def test_no_default_for_ensure
|
322
|
-
mount = mkmount
|
323
|
-
mount.finish
|
324
|
-
|
325
|
-
assert_nil(mount.should(:ensure), "Found default for ensure")
|
326
|
-
end
|
327
|
-
|
328
|
-
def disabled_test_retrieving_a_single_mount
|
329
|
-
@mount.defaultprovider = nil
|
330
|
-
|
331
|
-
provider = @mount.defaultprovider
|
332
|
-
assert(provider, "Could not retrieve default provider")
|
333
|
-
|
334
|
-
mount = Puppet::Type.type(:mount).create(:name => "/", :check => :all)
|
335
|
-
values = nil
|
336
|
-
assert_nothing_raised("Could not retrieve values for /") do
|
337
|
-
values = mount.retrieve
|
338
|
-
end
|
339
|
-
values.each do |property, value|
|
340
|
-
assert(value != :absent, "Got :absent for %s" % property.name)
|
341
|
-
end
|
342
|
-
end
|
343
|
-
|
344
|
-
# #726 - when filesystems are mounted but absent, Puppet does not write them out.
|
345
|
-
def test_mounted_but_absent
|
346
|
-
mount = @mount.create(:name => "/testing", :ensure => :mounted, :provider => :fake, :device => "/dev/something")
|
347
|
-
|
348
|
-
class << mount.provider
|
349
|
-
def mounted?
|
350
|
-
true
|
351
|
-
end
|
352
|
-
end
|
353
|
-
|
354
|
-
mount.provider.destroy
|
355
|
-
mount.provider.expects(:create)
|
356
|
-
mount.provider.expects(:mount).never
|
357
|
-
assert_apply(mount)
|
358
|
-
end
|
359
|
-
end
|
360
|
-
end
|
361
|
-
|
362
|
-
# $Id: mount.rb 2723 2007-07-20 16:46:54Z luke $
|