puppet 7.3.0-x86-mingw32 → 7.7.0-x86-mingw32
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +31 -25
- data/ext/build_defaults.yaml +0 -1
- data/install.rb +11 -11
- data/lib/hiera_puppet.rb +1 -1
- data/lib/puppet.rb +37 -37
- data/lib/puppet/agent.rb +6 -6
- data/lib/puppet/agent/disabler.rb +1 -1
- data/lib/puppet/agent/locker.rb +2 -2
- data/lib/puppet/application.rb +6 -6
- data/lib/puppet/application/agent.rb +18 -11
- data/lib/puppet/application/apply.rb +6 -5
- data/lib/puppet/application/catalog.rb +1 -1
- data/lib/puppet/application/config.rb +1 -1
- data/lib/puppet/application/describe.rb +1 -1
- data/lib/puppet/application/device.rb +8 -7
- data/lib/puppet/application/doc.rb +7 -7
- data/lib/puppet/application/epp.rb +2 -2
- data/lib/puppet/application/face_base.rb +2 -2
- data/lib/puppet/application/facts.rb +1 -1
- data/lib/puppet/application/filebucket.rb +2 -2
- data/lib/puppet/application/generate.rb +1 -1
- data/lib/puppet/application/help.rb +1 -1
- data/lib/puppet/application/indirection_base.rb +1 -1
- data/lib/puppet/application/lookup.rb +6 -6
- data/lib/puppet/application/module.rb +1 -1
- data/lib/puppet/application/node.rb +1 -1
- data/lib/puppet/application/parser.rb +2 -2
- data/lib/puppet/application/plugin.rb +1 -1
- data/lib/puppet/application/report.rb +1 -1
- data/lib/puppet/application/resource.rb +3 -2
- data/lib/puppet/application/script.rb +6 -5
- data/lib/puppet/application/ssl.rb +13 -2
- data/lib/puppet/application_support.rb +4 -4
- data/lib/puppet/compilable_resource_type.rb +1 -1
- data/lib/puppet/concurrent/lock.rb +1 -1
- data/lib/puppet/configurer.rb +4 -4
- data/lib/puppet/configurer/downloader.rb +4 -3
- data/lib/puppet/configurer/fact_handler.rb +3 -3
- data/lib/puppet/configurer/plugin_handler.rb +1 -1
- data/lib/puppet/confine.rb +1 -1
- data/lib/puppet/confine/boolean.rb +1 -1
- data/lib/puppet/confine/exists.rb +1 -1
- data/lib/puppet/confine/false.rb +1 -1
- data/lib/puppet/confine/feature.rb +1 -1
- data/lib/puppet/confine/true.rb +1 -1
- data/lib/puppet/confine/variable.rb +1 -1
- data/lib/puppet/confine_collection.rb +1 -1
- data/lib/puppet/confiner.rb +1 -1
- data/lib/puppet/context.rb +2 -2
- data/lib/puppet/context/trusted_information.rb +1 -1
- data/lib/puppet/daemon.rb +2 -2
- data/lib/puppet/data_binding.rb +1 -1
- data/lib/puppet/datatypes/error.rb +1 -1
- data/lib/puppet/defaults.rb +15 -11
- data/lib/puppet/environments.rb +17 -2
- data/lib/puppet/etc.rb +1 -1
- data/lib/puppet/external/pson/common.rb +1 -1
- data/lib/puppet/external/pson/pure.rb +3 -3
- data/lib/puppet/face.rb +1 -1
- data/lib/puppet/face/catalog.rb +1 -1
- data/lib/puppet/face/config.rb +2 -2
- data/lib/puppet/face/epp.rb +6 -6
- data/lib/puppet/face/facts.rb +18 -8
- data/lib/puppet/face/generate.rb +2 -2
- data/lib/puppet/face/help.rb +3 -3
- data/lib/puppet/face/module.rb +3 -3
- data/lib/puppet/face/module/install.rb +2 -2
- data/lib/puppet/face/node.rb +1 -1
- data/lib/puppet/face/parser.rb +4 -4
- data/lib/puppet/face/plugin.rb +2 -2
- data/lib/puppet/face/report.rb +1 -1
- data/lib/puppet/face/resource.rb +1 -1
- data/lib/puppet/feature/base.rb +2 -2
- data/lib/puppet/feature/bolt.rb +1 -1
- data/lib/puppet/feature/cfpropertylist.rb +1 -1
- data/lib/puppet/feature/eventlog.rb +1 -1
- data/lib/puppet/feature/hiera_eyaml.rb +1 -1
- data/lib/puppet/feature/hocon.rb +1 -1
- data/lib/puppet/feature/libuser.rb +2 -2
- data/lib/puppet/feature/msgpack.rb +1 -1
- data/lib/puppet/feature/pe_license.rb +1 -1
- data/lib/puppet/feature/selinux.rb +1 -1
- data/lib/puppet/feature/ssh.rb +1 -1
- data/lib/puppet/feature/telnet.rb +1 -1
- data/lib/puppet/feature/zlib.rb +1 -1
- data/lib/puppet/ffi/posix.rb +2 -2
- data/lib/puppet/ffi/posix/constants.rb +1 -1
- data/lib/puppet/ffi/posix/functions.rb +1 -1
- data/lib/puppet/ffi/windows.rb +4 -4
- data/lib/puppet/ffi/windows/api_types.rb +3 -3
- data/lib/puppet/ffi/windows/constants.rb +2 -2
- data/lib/puppet/ffi/windows/functions.rb +1 -1
- data/lib/puppet/ffi/windows/structs.rb +1 -1
- data/lib/puppet/file_bucket/dipper.rb +4 -4
- data/lib/puppet/file_bucket/file.rb +3 -3
- data/lib/puppet/file_serving/base.rb +2 -2
- data/lib/puppet/file_serving/configuration.rb +10 -10
- data/lib/puppet/file_serving/configuration/parser.rb +2 -2
- data/lib/puppet/file_serving/content.rb +3 -3
- data/lib/puppet/file_serving/fileset.rb +16 -4
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/metadata.rb +6 -6
- data/lib/puppet/file_serving/mount.rb +4 -4
- data/lib/puppet/file_serving/mount/file.rb +1 -1
- data/lib/puppet/file_serving/mount/locales.rb +1 -1
- data/lib/puppet/file_serving/mount/modules.rb +1 -1
- data/lib/puppet/file_serving/mount/pluginfacts.rb +1 -1
- data/lib/puppet/file_serving/mount/plugins.rb +1 -1
- data/lib/puppet/file_serving/mount/tasks.rb +1 -1
- data/lib/puppet/file_serving/terminus_helper.rb +2 -2
- data/lib/puppet/file_serving/terminus_selector.rb +1 -1
- data/lib/puppet/file_system.rb +9 -9
- data/lib/puppet/file_system/jruby.rb +1 -1
- data/lib/puppet/file_system/memory_file.rb +8 -1
- data/lib/puppet/file_system/path_pattern.rb +1 -1
- data/lib/puppet/file_system/uniquefile.rb +1 -1
- data/lib/puppet/file_system/windows.rb +4 -2
- data/lib/puppet/forge.rb +5 -5
- data/lib/puppet/forge/cache.rb +1 -1
- data/lib/puppet/forge/errors.rb +3 -3
- data/lib/puppet/forge/repository.rb +4 -4
- data/lib/puppet/functions.rb +1 -1
- data/lib/puppet/functions/all.rb +1 -1
- data/lib/puppet/functions/camelcase.rb +1 -1
- data/lib/puppet/functions/capitalize.rb +2 -2
- data/lib/puppet/functions/downcase.rb +2 -2
- data/lib/puppet/functions/get.rb +5 -5
- data/lib/puppet/functions/group_by.rb +13 -5
- data/lib/puppet/functions/lest.rb +1 -1
- data/lib/puppet/functions/new.rb +100 -100
- data/lib/puppet/functions/partition.rb +12 -4
- data/lib/puppet/functions/require.rb +5 -5
- data/lib/puppet/functions/sort.rb +3 -3
- data/lib/puppet/functions/tree_each.rb +7 -9
- data/lib/puppet/functions/type.rb +4 -4
- data/lib/puppet/functions/upcase.rb +2 -2
- data/lib/puppet/functions/versioncmp.rb +1 -1
- data/lib/puppet/generate/models/type/type.rb +1 -1
- data/lib/puppet/generate/type.rb +2 -2
- data/lib/puppet/gettext/config.rb +3 -3
- data/lib/puppet/gettext/module_translations.rb +1 -1
- data/lib/puppet/graph.rb +6 -6
- data/lib/puppet/graph/simple_graph.rb +2 -2
- data/lib/puppet/http.rb +26 -26
- data/lib/puppet/http/factory.rb +6 -2
- data/lib/puppet/http/proxy.rb +1 -1
- data/lib/puppet/http/resolver/server_list.rb +15 -4
- data/lib/puppet/http/service/compiler.rb +73 -1
- data/lib/puppet/http/service/file_server.rb +3 -2
- data/lib/puppet/indirector.rb +5 -5
- data/lib/puppet/indirector/catalog/compiler.rb +7 -6
- data/lib/puppet/indirector/catalog/json.rb +2 -2
- data/lib/puppet/indirector/catalog/msgpack.rb +2 -2
- data/lib/puppet/indirector/catalog/rest.rb +2 -2
- data/lib/puppet/indirector/catalog/store_configs.rb +2 -2
- data/lib/puppet/indirector/catalog/yaml.rb +2 -2
- data/lib/puppet/indirector/code.rb +1 -1
- data/lib/puppet/indirector/data_binding/hiera.rb +1 -1
- data/lib/puppet/indirector/data_binding/none.rb +1 -1
- data/lib/puppet/indirector/direct_file_server.rb +2 -2
- data/lib/puppet/indirector/envelope.rb +1 -1
- data/lib/puppet/indirector/errors.rb +1 -1
- data/lib/puppet/indirector/exec.rb +2 -2
- data/lib/puppet/indirector/face.rb +1 -1
- data/lib/puppet/indirector/facts/facter.rb +3 -2
- data/lib/puppet/indirector/facts/json.rb +3 -3
- data/lib/puppet/indirector/facts/memory.rb +2 -2
- data/lib/puppet/indirector/facts/network_device.rb +2 -2
- data/lib/puppet/indirector/facts/rest.rb +2 -2
- data/lib/puppet/indirector/facts/store_configs.rb +2 -2
- data/lib/puppet/indirector/facts/yaml.rb +3 -3
- data/lib/puppet/indirector/file_bucket_file/file.rb +4 -4
- data/lib/puppet/indirector/file_bucket_file/rest.rb +2 -2
- data/lib/puppet/indirector/file_bucket_file/selector.rb +1 -1
- data/lib/puppet/indirector/file_content.rb +1 -1
- data/lib/puppet/indirector/file_content/file.rb +3 -3
- data/lib/puppet/indirector/file_content/file_server.rb +3 -3
- data/lib/puppet/indirector/file_content/rest.rb +3 -3
- data/lib/puppet/indirector/file_content/selector.rb +4 -4
- data/lib/puppet/indirector/file_metadata.rb +1 -1
- data/lib/puppet/indirector/file_metadata/file.rb +3 -3
- data/lib/puppet/indirector/file_metadata/file_server.rb +3 -3
- data/lib/puppet/indirector/file_metadata/http.rb +3 -3
- data/lib/puppet/indirector/file_metadata/rest.rb +4 -3
- data/lib/puppet/indirector/file_metadata/selector.rb +4 -4
- data/lib/puppet/indirector/file_server.rb +4 -4
- data/lib/puppet/indirector/generic_http.rb +1 -1
- data/lib/puppet/indirector/hiera.rb +1 -1
- data/lib/puppet/indirector/indirection.rb +5 -5
- data/lib/puppet/indirector/json.rb +2 -2
- data/lib/puppet/indirector/memory.rb +1 -1
- data/lib/puppet/indirector/msgpack.rb +2 -2
- data/lib/puppet/indirector/node/exec.rb +2 -2
- data/lib/puppet/indirector/node/json.rb +2 -2
- data/lib/puppet/indirector/node/memory.rb +2 -2
- data/lib/puppet/indirector/node/msgpack.rb +2 -2
- data/lib/puppet/indirector/node/plain.rb +2 -2
- data/lib/puppet/indirector/node/rest.rb +2 -2
- data/lib/puppet/indirector/node/store_configs.rb +2 -2
- data/lib/puppet/indirector/node/yaml.rb +2 -2
- data/lib/puppet/indirector/none.rb +1 -1
- data/lib/puppet/indirector/plain.rb +1 -1
- data/lib/puppet/indirector/report/json.rb +2 -2
- data/lib/puppet/indirector/report/msgpack.rb +2 -2
- data/lib/puppet/indirector/report/processor.rb +3 -3
- data/lib/puppet/indirector/report/rest.rb +1 -1
- data/lib/puppet/indirector/report/yaml.rb +2 -2
- data/lib/puppet/indirector/request.rb +3 -3
- data/lib/puppet/indirector/resource/ral.rb +1 -1
- data/lib/puppet/indirector/resource/store_configs.rb +2 -2
- data/lib/puppet/indirector/terminus.rb +5 -5
- data/lib/puppet/indirector/yaml.rb +2 -2
- data/lib/puppet/info_service.rb +3 -3
- data/lib/puppet/info_service/class_information_service.rb +3 -3
- data/lib/puppet/info_service/plan_information_service.rb +1 -1
- data/lib/puppet/info_service/task_information_service.rb +1 -1
- data/lib/puppet/interface.rb +10 -10
- data/lib/puppet/interface/documentation.rb +1 -1
- data/lib/puppet/loaders.rb +21 -25
- data/lib/puppet/metatype/manager.rb +3 -3
- data/lib/puppet/module.rb +5 -4
- data/lib/puppet/module/plan.rb +1 -1
- data/lib/puppet/module/task.rb +1 -1
- data/lib/puppet/module_tool.rb +10 -10
- data/lib/puppet/module_tool/applications.rb +7 -7
- data/lib/puppet/module_tool/applications/application.rb +2 -2
- data/lib/puppet/module_tool/applications/checksummer.rb +2 -2
- data/lib/puppet/module_tool/applications/installer.rb +7 -7
- data/lib/puppet/module_tool/applications/unpacker.rb +2 -2
- data/lib/puppet/module_tool/applications/upgrader.rb +5 -5
- data/lib/puppet/module_tool/checksums.rb +1 -1
- data/lib/puppet/module_tool/contents_description.rb +1 -1
- data/lib/puppet/module_tool/dependency.rb +2 -2
- data/lib/puppet/module_tool/errors.rb +6 -6
- data/lib/puppet/module_tool/install_directory.rb +2 -2
- data/lib/puppet/module_tool/installed_modules.rb +2 -2
- data/lib/puppet/module_tool/local_tarball.rb +2 -2
- data/lib/puppet/module_tool/metadata.rb +3 -3
- data/lib/puppet/module_tool/tar.rb +4 -4
- data/lib/puppet/network/format.rb +1 -1
- data/lib/puppet/network/format_handler.rb +3 -3
- data/lib/puppet/network/format_support.rb +1 -1
- data/lib/puppet/network/formats.rb +2 -2
- data/lib/puppet/network/http.rb +17 -14
- data/lib/puppet/network/http/api.rb +11 -7
- data/lib/puppet/network/http/api/indirected_routes.rb +1 -1
- data/lib/puppet/network/http/api/master.rb +3 -2
- data/lib/puppet/network/http/api/master/v3.rb +2 -25
- data/lib/puppet/network/http/api/master/v3/environments.rb +2 -33
- data/lib/puppet/network/http/api/server.rb +10 -0
- data/lib/puppet/network/http/api/server/v3.rb +39 -0
- data/lib/puppet/network/http/api/server/v3/environments.rb +48 -0
- data/lib/puppet/network/http/connection.rb +1 -1
- data/lib/puppet/network/http/error.rb +1 -1
- data/lib/puppet/network/http/handler.rb +3 -3
- data/lib/puppet/network/http_pool.rb +1 -1
- data/lib/puppet/node.rb +3 -3
- data/lib/puppet/node/environment.rb +15 -8
- data/lib/puppet/node/facts.rb +3 -3
- data/lib/puppet/pal/pal_api.rb +10 -10
- data/lib/puppet/pal/pal_impl.rb +3 -3
- data/lib/puppet/parameter.rb +4 -4
- data/lib/puppet/parameter/boolean.rb +1 -1
- data/lib/puppet/parameter/package_options.rb +1 -1
- data/lib/puppet/parameter/path.rb +1 -1
- data/lib/puppet/parameter/value.rb +1 -1
- data/lib/puppet/parameter/value_collection.rb +1 -1
- data/lib/puppet/parser.rb +10 -10
- data/lib/puppet/parser/ast.rb +8 -8
- data/lib/puppet/parser/ast/hostclass.rb +1 -1
- data/lib/puppet/parser/ast/pops_bridge.rb +2 -2
- data/lib/puppet/parser/catalog_compiler.rb +2 -2
- data/lib/puppet/parser/compiler.rb +5 -5
- data/lib/puppet/parser/e4_parser_adapter.rb +1 -1
- data/lib/puppet/parser/functions.rb +4 -4
- data/lib/puppet/parser/functions/digest.rb +1 -1
- data/lib/puppet/parser/functions/file.rb +1 -1
- data/lib/puppet/parser/functions/fqdn_rand.rb +14 -6
- data/lib/puppet/parser/functions/versioncmp.rb +1 -1
- data/lib/puppet/parser/parser_factory.rb +2 -2
- data/lib/puppet/parser/resource.rb +3 -3
- data/lib/puppet/parser/scope.rb +3 -3
- data/lib/puppet/parser/script_compiler.rb +2 -2
- data/lib/puppet/parser/templatewrapper.rb +2 -2
- data/lib/puppet/parser/type_loader.rb +1 -1
- data/lib/puppet/plugins/configuration.rb +5 -5
- data/lib/puppet/pops.rb +57 -57
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +1 -1
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +7 -7
- data/lib/puppet/pops/evaluator/external_syntax_support.rb +1 -1
- data/lib/puppet/pops/loader/base_loader.rb +42 -32
- data/lib/puppet/pops/loader/dependency_loader.rb +2 -2
- data/lib/puppet/pops/loader/loader.rb +15 -5
- data/lib/puppet/pops/loader/module_loaders.rb +8 -8
- data/lib/puppet/pops/loader/predefined_loader.rb +4 -0
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +1 -1
- data/lib/puppet/pops/loader/static_loader.rb +4 -0
- data/lib/puppet/pops/loader/task_instantiator.rb +1 -1
- data/lib/puppet/pops/loaders.rb +4 -4
- data/lib/puppet/pops/lookup/invocation.rb +1 -1
- data/lib/puppet/pops/model/ast_transformer.rb +1 -1
- data/lib/puppet/pops/model/pn_transformer.rb +1 -1
- data/lib/puppet/pops/parser/eparser.rb +2 -2
- data/lib/puppet/pops/parser/evaluating_parser.rb +1 -1
- data/lib/puppet/pops/parser/lexer2.rb +5 -9
- data/lib/puppet/pops/parser/lexer_support.rb +1 -1
- data/lib/puppet/pops/parser/parser_support.rb +4 -4
- data/lib/puppet/pops/puppet_stack.rb +1 -1
- data/lib/puppet/pops/serialization/json.rb +1 -1
- data/lib/puppet/pops/serialization/json_path.rb +1 -1
- data/lib/puppet/pops/time/timespan.rb +1 -1
- data/lib/puppet/pops/types/p_type_set_type.rb +1 -1
- data/lib/puppet/pops/types/string_converter.rb +1 -1
- data/lib/puppet/pops/types/type_calculator.rb +1 -1
- data/lib/puppet/pops/types/type_formatter.rb +1 -1
- data/lib/puppet/pops/types/type_parser.rb +1 -1
- data/lib/puppet/pops/types/types.rb +1 -1
- data/lib/puppet/pops/validation/checker4_0.rb +1 -2
- data/lib/puppet/property.rb +3 -3
- data/lib/puppet/property/boolean.rb +1 -1
- data/lib/puppet/property/ensure.rb +1 -1
- data/lib/puppet/property/keyvalue.rb +1 -1
- data/lib/puppet/property/list.rb +2 -2
- data/lib/puppet/property/ordered_list.rb +1 -1
- data/lib/puppet/provider.rb +2 -2
- data/lib/puppet/provider/confine.rb +2 -2
- data/lib/puppet/provider/exec.rb +2 -2
- data/lib/puppet/provider/exec/posix.rb +1 -1
- data/lib/puppet/provider/exec/windows.rb +1 -1
- data/lib/puppet/provider/file/posix.rb +1 -1
- data/lib/puppet/provider/file/windows.rb +1 -1
- data/lib/puppet/provider/group/aix.rb +1 -1
- data/lib/puppet/provider/group/directoryservice.rb +1 -1
- data/lib/puppet/provider/group/groupadd.rb +15 -10
- data/lib/puppet/provider/group/ldap.rb +1 -1
- data/lib/puppet/provider/group/pw.rb +1 -1
- data/lib/puppet/provider/group/windows_adsi.rb +1 -1
- data/lib/puppet/provider/ldap.rb +2 -2
- data/lib/puppet/provider/nameservice.rb +1 -1
- data/lib/puppet/provider/nameservice/directoryservice.rb +3 -3
- data/lib/puppet/provider/nameservice/objectadd.rb +1 -1
- data/lib/puppet/provider/nameservice/pw.rb +1 -1
- data/lib/puppet/provider/package.rb +1 -1
- data/lib/puppet/provider/package/aix.rb +2 -2
- data/lib/puppet/provider/package/appdmg.rb +2 -2
- data/lib/puppet/provider/package/apple.rb +1 -1
- data/lib/puppet/provider/package/apt.rb +32 -4
- data/lib/puppet/provider/package/aptitude.rb +6 -0
- data/lib/puppet/provider/package/dnfmodule.rb +2 -2
- data/lib/puppet/provider/package/dpkg.rb +1 -1
- data/lib/puppet/provider/package/gem.rb +3 -3
- data/lib/puppet/provider/package/hpux.rb +1 -1
- data/lib/puppet/provider/package/macports.rb +2 -2
- data/lib/puppet/provider/package/nim.rb +2 -2
- data/lib/puppet/provider/package/openbsd.rb +1 -1
- data/lib/puppet/provider/package/opkg.rb +1 -1
- data/lib/puppet/provider/package/pacman.rb +1 -1
- data/lib/puppet/provider/package/pip.rb +3 -3
- data/lib/puppet/provider/package/pkg.rb +2 -2
- data/lib/puppet/provider/package/pkgdmg.rb +3 -3
- data/lib/puppet/provider/package/pkgin.rb +1 -1
- data/lib/puppet/provider/package/pkgng.rb +1 -1
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/portupgrade.rb +1 -1
- data/lib/puppet/provider/package/puppet_gem.rb +12 -1
- data/lib/puppet/provider/package/puppetserver_gem.rb +0 -0
- data/lib/puppet/provider/package/rpm.rb +2 -2
- data/lib/puppet/provider/package/sun.rb +1 -1
- data/lib/puppet/provider/package/windows.rb +3 -3
- data/lib/puppet/provider/package/windows/exe_package.rb +1 -1
- data/lib/puppet/provider/package/windows/msi_package.rb +1 -1
- data/lib/puppet/provider/package/windows/package.rb +4 -4
- data/lib/puppet/provider/package/yum.rb +3 -3
- data/lib/puppet/provider/package_targetable.rb +1 -1
- data/lib/puppet/provider/parsedfile.rb +3 -3
- data/lib/puppet/provider/service/base.rb +6 -4
- data/lib/puppet/provider/service/daemontools.rb +0 -1
- data/lib/puppet/provider/service/debian.rb +5 -5
- data/lib/puppet/provider/service/init.rb +1 -1
- data/lib/puppet/provider/service/launchd.rb +9 -3
- data/lib/puppet/provider/service/service.rb +28 -3
- data/lib/puppet/provider/service/smf.rb +0 -24
- data/lib/puppet/provider/service/src.rb +2 -2
- data/lib/puppet/provider/service/systemd.rb +12 -7
- data/lib/puppet/provider/service/windows.rb +38 -0
- data/lib/puppet/provider/user/aix.rb +2 -2
- data/lib/puppet/provider/user/directoryservice.rb +2 -2
- data/lib/puppet/provider/user/ldap.rb +1 -1
- data/lib/puppet/provider/user/openbsd.rb +1 -1
- data/lib/puppet/provider/user/pw.rb +1 -1
- data/lib/puppet/provider/user/user_role_add.rb +2 -2
- data/lib/puppet/provider/user/useradd.rb +65 -11
- data/lib/puppet/provider/user/windows_adsi.rb +1 -1
- data/lib/puppet/reference/configuration.rb +1 -1
- data/lib/puppet/reference/indirection.rb +4 -4
- data/lib/puppet/reference/report.rb +1 -1
- data/lib/puppet/reports.rb +1 -1
- data/lib/puppet/reports/http.rb +2 -2
- data/lib/puppet/reports/log.rb +1 -1
- data/lib/puppet/reports/store.rb +2 -2
- data/lib/puppet/resource.rb +4 -4
- data/lib/puppet/resource/catalog.rb +5 -5
- data/lib/puppet/resource/status.rb +2 -2
- data/lib/puppet/resource/type.rb +4 -4
- data/lib/puppet/resource/type_collection.rb +4 -4
- data/lib/puppet/runtime.rb +1 -1
- data/lib/puppet/scheduler.rb +4 -4
- data/lib/puppet/settings.rb +31 -30
- data/lib/puppet/settings/autosign_setting.rb +1 -1
- data/lib/puppet/settings/base_setting.rb +2 -2
- data/lib/puppet/settings/certificate_revocation_setting.rb +1 -1
- data/lib/puppet/settings/config_file.rb +1 -1
- data/lib/puppet/settings/environment_conf.rb +1 -0
- data/lib/puppet/settings/errors.rb +1 -1
- data/lib/puppet/settings/priority_setting.rb +3 -3
- data/lib/puppet/ssl.rb +11 -11
- data/lib/puppet/ssl/base.rb +3 -3
- data/lib/puppet/ssl/certificate.rb +1 -1
- data/lib/puppet/ssl/certificate_request.rb +2 -2
- data/lib/puppet/ssl/certificate_request_attributes.rb +2 -2
- data/lib/puppet/ssl/oids.rb +1 -1
- data/lib/puppet/ssl/openssl_loader.rb +1 -1
- data/lib/puppet/ssl/ssl_context.rb +1 -1
- data/lib/puppet/ssl/ssl_provider.rb +1 -1
- data/lib/puppet/ssl/state_machine.rb +2 -2
- data/lib/puppet/ssl/verifier.rb +5 -1
- data/lib/puppet/syntax_checkers/base64.rb +1 -1
- data/lib/puppet/syntax_checkers/epp.rb +1 -1
- data/lib/puppet/syntax_checkers/json.rb +1 -1
- data/lib/puppet/syntax_checkers/pp.rb +1 -1
- data/lib/puppet/transaction.rb +11 -11
- data/lib/puppet/transaction/event.rb +4 -4
- data/lib/puppet/transaction/event_manager.rb +1 -1
- data/lib/puppet/transaction/persistence.rb +1 -1
- data/lib/puppet/transaction/report.rb +2 -2
- data/lib/puppet/transaction/resource_harness.rb +1 -1
- data/lib/puppet/type.rb +14 -14
- data/lib/puppet/type/component.rb +3 -3
- data/lib/puppet/type/file.rb +37 -19
- data/lib/puppet/type/file/checksum.rb +1 -1
- data/lib/puppet/type/file/checksum_value.rb +2 -2
- data/lib/puppet/type/file/content.rb +2 -2
- data/lib/puppet/type/file/data_sync.rb +2 -2
- data/lib/puppet/type/file/ensure.rb +1 -1
- data/lib/puppet/type/file/group.rb +1 -1
- data/lib/puppet/type/file/mode.rb +1 -1
- data/lib/puppet/type/file/selcontext.rb +2 -2
- data/lib/puppet/type/file/source.rb +4 -4
- data/lib/puppet/type/filebucket.rb +1 -1
- data/lib/puppet/type/group.rb +2 -2
- data/lib/puppet/type/package.rb +5 -5
- data/lib/puppet/type/resources.rb +2 -2
- data/lib/puppet/type/service.rb +10 -29
- data/lib/puppet/type/tidy.rb +24 -5
- data/lib/puppet/type/user.rb +4 -4
- data/lib/puppet/util.rb +43 -34
- data/lib/puppet/util/at_fork.rb +3 -3
- data/lib/puppet/util/at_fork/solaris.rb +1 -1
- data/lib/puppet/util/autoload.rb +4 -4
- data/lib/puppet/util/checksums.rb +3 -3
- data/lib/puppet/util/colors.rb +1 -1
- data/lib/puppet/util/command_line.rb +6 -6
- data/lib/puppet/util/command_line/puppet_option_parser.rb +2 -2
- data/lib/puppet/util/execution.rb +2 -2
- data/lib/puppet/util/feature.rb +2 -2
- data/lib/puppet/util/filetype.rb +1 -1
- data/lib/puppet/util/http_proxy.rb +1 -1
- data/lib/puppet/util/inifile.rb +2 -2
- data/lib/puppet/util/instance_loader.rb +3 -3
- data/lib/puppet/util/json_lockfile.rb +1 -1
- data/lib/puppet/util/ldap/connection.rb +1 -1
- data/lib/puppet/util/ldap/generator.rb +1 -1
- data/lib/puppet/util/ldap/manager.rb +3 -3
- data/lib/puppet/util/limits.rb +1 -1
- data/lib/puppet/util/log.rb +6 -6
- data/lib/puppet/util/log/destinations.rb +1 -1
- data/lib/puppet/util/logging.rb +2 -2
- data/lib/puppet/util/metric.rb +2 -2
- data/lib/puppet/util/monkey_patches.rb +14 -3
- data/lib/puppet/util/network_device/base.rb +3 -3
- data/lib/puppet/util/network_device/config.rb +2 -2
- data/lib/puppet/util/network_device/transport.rb +1 -1
- data/lib/puppet/util/network_device/transport/base.rb +2 -2
- data/lib/puppet/util/package/version/range.rb +6 -6
- data/lib/puppet/util/package/version/range/eq.rb +1 -1
- data/lib/puppet/util/package/version/range/gt.rb +1 -1
- data/lib/puppet/util/package/version/range/gt_eq.rb +1 -1
- data/lib/puppet/util/package/version/range/lt.rb +1 -1
- data/lib/puppet/util/package/version/range/lt_eq.rb +1 -1
- data/lib/puppet/util/package/version/range/min_max.rb +1 -1
- data/lib/puppet/util/package/version/range/simple.rb +1 -1
- data/lib/puppet/util/package/version/rpm.rb +1 -1
- data/lib/puppet/util/pidlock.rb +1 -1
- data/lib/puppet/util/plist.rb +1 -1
- data/lib/puppet/util/posix.rb +1 -1
- data/lib/puppet/util/profiler.rb +3 -3
- data/lib/puppet/util/profiler/aggregate.rb +2 -2
- data/lib/puppet/util/profiler/object_counts.rb +1 -1
- data/lib/puppet/util/profiler/wall_clock.rb +1 -1
- data/lib/puppet/util/provider_features.rb +2 -2
- data/lib/puppet/util/rdoc.rb +2 -2
- data/lib/puppet/util/rdoc/generators/puppet_generator.rb +2 -2
- data/lib/puppet/util/rdoc/parser.rb +6 -6
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
- data/lib/puppet/util/reference.rb +1 -1
- data/lib/puppet/util/resource_template.rb +2 -2
- data/lib/puppet/util/rubygems.rb +1 -1
- data/lib/puppet/util/selinux.rb +30 -4
- data/lib/puppet/util/skip_tags.rb +1 -1
- data/lib/puppet/util/storage.rb +1 -1
- data/lib/puppet/util/suidmanager.rb +2 -2
- data/lib/puppet/util/symbolic_file_mode.rb +1 -1
- data/lib/puppet/util/tag_set.rb +1 -1
- data/lib/puppet/util/tagging.rb +1 -1
- data/lib/puppet/util/watched_file.rb +1 -1
- data/lib/puppet/util/watcher.rb +3 -3
- data/lib/puppet/util/windows.rb +20 -20
- data/lib/puppet/util/windows/access_control_entry.rb +1 -1
- data/lib/puppet/util/windows/adsi.rb +47 -1
- data/lib/puppet/util/windows/daemon.rb +1 -1
- data/lib/puppet/util/windows/error.rb +2 -2
- data/lib/puppet/util/windows/file.rb +1 -1
- data/lib/puppet/util/windows/monkey_patches/process.rb +2 -2
- data/lib/puppet/util/windows/principal.rb +10 -3
- data/lib/puppet/util/windows/process.rb +2 -2
- data/lib/puppet/util/windows/registry.rb +1 -1
- data/lib/puppet/util/windows/root_certs.rb +2 -2
- data/lib/puppet/util/windows/security.rb +1 -1
- data/lib/puppet/util/windows/security_descriptor.rb +1 -1
- data/lib/puppet/util/windows/service.rb +1 -1
- data/lib/puppet/util/windows/sid.rb +5 -3
- data/lib/puppet/util/windows/user.rb +1 -1
- data/lib/puppet/vendor.rb +1 -1
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet/x509.rb +4 -4
- data/lib/puppet/x509/cert_provider.rb +1 -1
- data/lib/puppet/x509/pem_store.rb +1 -1
- data/lib/puppet_pal.rb +2 -2
- data/locales/puppet.pot +173 -157
- data/man/man5/puppet.conf.5 +263 -240
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +5 -2
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -1
- data/man/man8/puppet-node.8 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +5 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/ssl/127.0.0.1-key.pem +107 -57
- data/spec/fixtures/ssl/127.0.0.1.pem +52 -31
- data/spec/fixtures/ssl/bad-basic-constraints.pem +57 -35
- data/spec/fixtures/ssl/bad-int-basic-constraints.pem +57 -35
- data/spec/fixtures/ssl/ca.pem +57 -35
- data/spec/fixtures/ssl/crl.pem +28 -18
- data/spec/fixtures/ssl/ec-key.pem +11 -11
- data/spec/fixtures/ssl/ec.pem +33 -24
- data/spec/fixtures/ssl/encrypted-ec-key.pem +12 -12
- data/spec/fixtures/ssl/encrypted-key.pem +108 -58
- data/spec/fixtures/ssl/intermediate-agent-crl.pem +28 -19
- data/spec/fixtures/ssl/intermediate-agent.pem +57 -36
- data/spec/fixtures/ssl/intermediate-crl.pem +31 -21
- data/spec/fixtures/ssl/intermediate.pem +57 -36
- data/spec/fixtures/ssl/pluto-key.pem +107 -57
- data/spec/fixtures/ssl/pluto.pem +52 -30
- data/spec/fixtures/ssl/request-key.pem +107 -57
- data/spec/fixtures/ssl/request.pem +47 -26
- data/spec/fixtures/ssl/revoked-key.pem +107 -57
- data/spec/fixtures/ssl/revoked.pem +52 -30
- data/spec/fixtures/ssl/signed-key.pem +107 -57
- data/spec/fixtures/ssl/signed.pem +52 -30
- data/spec/fixtures/ssl/tampered-cert.pem +52 -30
- data/spec/fixtures/ssl/tampered-csr.pem +47 -26
- data/spec/fixtures/ssl/unknown-127.0.0.1-key.pem +107 -57
- data/spec/fixtures/ssl/unknown-127.0.0.1.pem +50 -29
- data/spec/fixtures/ssl/unknown-ca-key.pem +107 -57
- data/spec/fixtures/ssl/unknown-ca.pem +55 -33
- data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset +9 -0
- data/spec/integration/application/agent_spec.rb +33 -0
- data/spec/integration/application/plugin_spec.rb +1 -1
- data/spec/integration/http/client_spec.rb +12 -0
- data/spec/integration/indirector/direct_file_server_spec.rb +1 -3
- data/spec/integration/parser/collection_spec.rb +10 -0
- data/spec/integration/type/file_spec.rb +5 -5
- data/spec/integration/util/windows/adsi_spec.rb +18 -0
- data/spec/integration/util/windows/principal_spec.rb +21 -0
- data/spec/integration/util/windows/registry_spec.rb +6 -0
- data/spec/lib/puppet/test_ca.rb +2 -2
- data/spec/lib/puppet_spec/files.rb +1 -1
- data/spec/shared_contexts/provider.rb +16 -0
- data/spec/spec_helper.rb +11 -1
- data/spec/unit/application/agent_spec.rb +7 -2
- data/spec/unit/application/facts_spec.rb +58 -7
- data/spec/unit/application/ssl_spec.rb +23 -0
- data/spec/unit/configurer/downloader_spec.rb +6 -0
- data/spec/unit/configurer_spec.rb +23 -0
- data/spec/unit/environments_spec.rb +164 -88
- data/spec/unit/file_bucket/dipper_spec.rb +1 -1
- data/spec/unit/file_serving/fileset_spec.rb +60 -0
- data/spec/unit/file_system_spec.rb +9 -0
- data/spec/unit/gettext/config_spec.rb +12 -0
- data/spec/unit/http/factory_spec.rb +19 -0
- data/spec/unit/http/service/compiler_spec.rb +123 -0
- data/spec/unit/indirector/catalog/compiler_spec.rb +14 -10
- data/spec/unit/indirector/facts/facter_spec.rb +9 -0
- data/spec/unit/module_spec.rb +1 -1
- data/spec/unit/network/http/api/master_spec.rb +38 -0
- data/spec/unit/network/http/api/{master → server}/v3/environments_spec.rb +2 -2
- data/spec/unit/network/http/api/{master → server}/v3_spec.rb +19 -19
- data/spec/unit/network/http/api_spec.rb +11 -11
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +15 -1
- data/spec/unit/pops/loaders/dependency_loader_spec.rb +1 -1
- data/spec/unit/pops/lookup/context_spec.rb +1 -1
- data/spec/unit/pops/parser/lexer2_spec.rb +0 -4
- data/spec/unit/pops/types/type_parser_spec.rb +2 -1
- data/spec/unit/pops/validator/validator_spec.rb +20 -43
- data/spec/unit/provider/group/groupadd_spec.rb +5 -2
- data/spec/unit/provider/package/apt_spec.rb +24 -15
- data/spec/unit/provider/package/aptitude_spec.rb +1 -1
- data/spec/unit/provider/package/dnfmodule_spec.rb +13 -4
- data/spec/unit/provider/package/gem_spec.rb +3 -1
- data/spec/unit/provider/package/pip2_spec.rb +3 -1
- data/spec/unit/provider/package/pip3_spec.rb +3 -1
- data/spec/unit/provider/package/pip_spec.rb +3 -1
- data/spec/unit/provider/package/pkg_spec.rb +44 -44
- data/spec/unit/provider/package/puppet_gem_spec.rb +31 -1
- data/spec/unit/provider/package/puppetserver_gem_spec.rb +2 -0
- data/spec/unit/provider/service/base_spec.rb +8 -8
- data/spec/unit/provider/service/bsd_spec.rb +0 -4
- data/spec/unit/provider/service/daemontools_spec.rb +1 -1
- data/spec/unit/provider/service/debian_spec.rb +15 -17
- data/spec/unit/provider/service/gentoo_spec.rb +19 -14
- data/spec/unit/provider/service/init_spec.rb +29 -20
- data/spec/unit/provider/service/launchd_spec.rb +10 -12
- data/spec/unit/provider/service/openbsd_spec.rb +21 -35
- data/spec/unit/provider/service/openrc_spec.rb +15 -14
- data/spec/unit/provider/service/openwrt_spec.rb +3 -1
- data/spec/unit/provider/service/redhat_spec.rb +20 -19
- data/spec/unit/provider/service/smf_spec.rb +6 -5
- data/spec/unit/provider/service/src_spec.rb +5 -10
- data/spec/unit/provider/service/systemd_spec.rb +68 -29
- data/spec/unit/provider/service/upstart_spec.rb +25 -20
- data/spec/unit/provider/service/windows_spec.rb +202 -0
- data/spec/unit/provider/user/useradd_spec.rb +70 -3
- data/spec/unit/resource/catalog_spec.rb +1 -1
- data/spec/unit/ssl/certificate_request_spec.rb +4 -10
- data/spec/unit/ssl/state_machine_spec.rb +19 -5
- data/spec/unit/transaction/additional_resource_generator_spec.rb +0 -2
- data/spec/unit/transaction_spec.rb +18 -20
- data/spec/unit/type/file/selinux_spec.rb +3 -3
- data/spec/unit/type/service_spec.rb +10 -154
- data/spec/unit/type/tidy_spec.rb +17 -7
- data/spec/unit/util/at_fork_spec.rb +9 -9
- data/spec/unit/util/posix_spec.rb +1 -1
- data/spec/unit/util/selinux_spec.rb +87 -16
- data/spec/unit/util/windows/sid_spec.rb +6 -0
- data/tasks/generate_cert_fixtures.rake +2 -2
- metadata +15 -16
- data/spec/lib/matchers/include.rb +0 -27
- data/spec/lib/matchers/include_spec.rb +0 -32
- data/spec/unit/pops/parser/parse_application_spec.rb +0 -13
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -23
- data/spec/unit/pops/parser/parse_site_spec.rb +0 -43
@@ -4,16 +4,6 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
4
4
|
let (:resource) { Puppet::Resource.new(:package, 'dummy', :parameters => {:name => 'dummy', :ensure => :latest}) }
|
5
5
|
let (:provider) { described_class.new(resource) }
|
6
6
|
|
7
|
-
before(:all) do
|
8
|
-
if Puppet::Util::Platform.windows?
|
9
|
-
# Get a pid for $CHILD_STATUS to latch on to
|
10
|
-
command = "cmd.exe /c \"exit 0\""
|
11
|
-
Puppet::Util::Execution.execute(command, {:failonfail => false})
|
12
|
-
else
|
13
|
-
Puppet::Util::Execution.execute('exit 0', {:failonfail => false})
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
7
|
before :each do
|
18
8
|
allow(described_class).to receive(:command).with(:pkg).and_return('/bin/pkg')
|
19
9
|
end
|
@@ -120,7 +110,6 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
120
110
|
expect(Puppet::Util::Execution).to receive(:execute)
|
121
111
|
.with(['/bin/pkg', 'update', '-n', 'dummy'], {:failonfail => false, :combine => true})
|
122
112
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
123
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
124
113
|
|
125
114
|
expect(described_class).to receive(:pkg).with(:list,'-Hvn','dummy').and_return(File.read(my_fixture('dummy_solaris11.known')))
|
126
115
|
expect(provider.latest).to eq('1.0.6,5.11-0.175.0.0.0.2.537:20131230T130000Z')
|
@@ -132,8 +121,9 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
132
121
|
end
|
133
122
|
|
134
123
|
it "should work correctly for ensure latest on solaris 11(known IFO)" do
|
135
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
136
|
-
|
124
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
125
|
+
.with(['/bin/pkg', 'update', '-n', 'dummy'], {:failonfail => false, :combine => true})
|
126
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
137
127
|
|
138
128
|
expect(described_class).to receive(:pkg).with(:list,'-Hvn','dummy').and_return(File.read(my_fixture('dummy_solaris11.ifo.known')))
|
139
129
|
expect(provider.latest).to eq('1.0.6,5.11-0.175.0.0.0.2.537:20131230T130000Z')
|
@@ -158,7 +148,8 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
158
148
|
resource[:install_options] = ['--foo', {'--bar' => 'baz'}]
|
159
149
|
expect(described_class).to receive(:pkg).with(:list,'-Hvn','dummy').and_return(File.read(my_fixture('dummy_solaris11.known')))
|
160
150
|
expect(Puppet::Util::Execution).to receive(:execute)
|
161
|
-
|
151
|
+
.with(['/bin/pkg', 'update', '-n', '--foo', '--bar=baz', 'dummy'], {failonfail: false, combine: true})
|
152
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
162
153
|
provider.latest
|
163
154
|
end
|
164
155
|
end
|
@@ -195,7 +186,6 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
195
186
|
expect(Puppet::Util::Execution).to receive(:execute)
|
196
187
|
.with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
|
197
188
|
.and_return(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_solaris10')), 0))
|
198
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
199
189
|
expect(provider.query).to eq({
|
200
190
|
:name => 'dummy',
|
201
191
|
:ensure => '2.5.5,5.10-0.111:20131230T130000Z',
|
@@ -208,15 +198,13 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
208
198
|
it "should return :absent when the package is not found" do
|
209
199
|
expect(Puppet::Util::Execution).to receive(:execute)
|
210
200
|
.with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
|
211
|
-
.and_return(Puppet::Util::Execution::ProcessOutput.new('',
|
212
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(1)
|
201
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 1))
|
213
202
|
expect(provider.query).to eq({:ensure => :absent, :name => "dummy"})
|
214
203
|
end
|
215
204
|
end
|
216
205
|
|
217
206
|
context "on solaris 11" do
|
218
207
|
it "should find the package" do
|
219
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
220
208
|
expect(Puppet::Util::Execution).to receive(:execute)
|
221
209
|
.with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
|
222
210
|
.and_return(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_solaris11.installed')), 0))
|
@@ -232,8 +220,7 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
232
220
|
it "should return :absent when the package is not found" do
|
233
221
|
expect(Puppet::Util::Execution).to receive(:execute)
|
234
222
|
.with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
|
235
|
-
.and_return(Puppet::Util::Execution::ProcessOutput.new('',
|
236
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(1)
|
223
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 1))
|
237
224
|
expect(provider.query).to eq({:ensure => :absent, :name => "dummy"})
|
238
225
|
end
|
239
226
|
end
|
@@ -242,7 +229,6 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
242
229
|
expect(Puppet::Util::Execution).to receive(:execute)
|
243
230
|
.with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
|
244
231
|
.and_return(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('incomplete')), 0))
|
245
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
246
232
|
expect {
|
247
233
|
provider.query
|
248
234
|
}.to raise_error(ArgumentError, /Unknown line format/)
|
@@ -266,7 +252,7 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
266
252
|
expect(provider).to receive(:unhold)
|
267
253
|
expect(Puppet::Util::Execution).to receive(:execute)
|
268
254
|
.with(['/bin/pkg', 'install', *hash[:flags], '--foo', '--bar=baz', 'dummy'], {:failonfail => false, :combine => true})
|
269
|
-
|
255
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
270
256
|
provider.install
|
271
257
|
end
|
272
258
|
|
@@ -279,16 +265,16 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
279
265
|
expect(Puppet::Util::Execution).to receive(:execute)
|
280
266
|
.with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
|
281
267
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
282
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
283
268
|
provider.install
|
284
269
|
end
|
285
270
|
|
286
271
|
it "should install specific version(1)" do
|
287
272
|
# Should install also check if the version installed is the same version we are asked to install? or should we rely on puppet for that?
|
288
273
|
resource[:ensure] = '0.0.7,5.11-0.151006:20131230T130000Z'
|
289
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
290
274
|
expect(provider).to receive(:properties).and_return({:mark => :hold})
|
291
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
275
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
276
|
+
.with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
|
277
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
292
278
|
expect(Puppet::Util::Execution).to receive(:execute)
|
293
279
|
.with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
|
294
280
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('pkg://foo/dummy@0.0.6,5.11-0.151006:20131230T130000Z installed -----', 0))
|
@@ -301,14 +287,15 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
301
287
|
it "should install specific version(2)" do
|
302
288
|
resource[:ensure] = '0.0.8'
|
303
289
|
expect(provider).to receive(:properties).and_return({:mark => :hold})
|
304
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
290
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
291
|
+
.with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
|
292
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
305
293
|
expect(Puppet::Util::Execution).to receive(:execute)
|
306
294
|
.with(['/bin/pkg', 'list', '-Hv', 'dummy'], {:failonfail => false, :combine => true})
|
307
295
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('pkg://foo/dummy@0.0.7,5.11-0.151006:20131230T130000Z installed -----', 0))
|
308
296
|
expect(Puppet::Util::Execution).to receive(:execute)
|
309
297
|
.with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.8'], {:failonfail => false, :combine => true})
|
310
298
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
311
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
312
299
|
provider.install
|
313
300
|
end
|
314
301
|
|
@@ -316,8 +303,9 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
316
303
|
resource[:ensure] = '0.0.7'
|
317
304
|
expect(provider).to receive(:properties).and_return({:mark => :hold})
|
318
305
|
expect(provider).to receive(:query).with(no_args).and_return({:ensure => '0.0.8,5.11-0.151106:20131230T130000Z'})
|
319
|
-
|
320
|
-
|
306
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
307
|
+
.with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
|
308
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
321
309
|
expect(Puppet::Util::Execution).to receive(:execute)
|
322
310
|
.with(['/bin/pkg', 'update', *hash[:flags], 'dummy@0.0.7'], {:failonfail => false, :combine => true})
|
323
311
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
@@ -331,8 +319,9 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
331
319
|
expect(Puppet::Util::Execution).to receive(:execute)
|
332
320
|
.with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true})
|
333
321
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
334
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
335
|
-
|
322
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
323
|
+
.with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
|
324
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
336
325
|
provider.install
|
337
326
|
end
|
338
327
|
|
@@ -340,11 +329,12 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
340
329
|
resource[:ensure] = '0.0.7'
|
341
330
|
expect(provider).to receive(:properties).and_return({:mark => :hold})
|
342
331
|
expect(provider).to receive(:query).with(no_args).and_return({:ensure => :absent})
|
343
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
332
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
333
|
+
.with(['/bin/pkg', 'unfreeze', 'dummy'], {:failonfail => false, :combine => true})
|
334
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
344
335
|
expect(Puppet::Util::Execution).to receive(:execute)
|
345
336
|
.with(['/bin/pkg', 'install', *hash[:flags], 'dummy@0.0.7'], {:failonfail => false, :combine => true})
|
346
337
|
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
347
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
|
348
338
|
provider.install
|
349
339
|
end
|
350
340
|
|
@@ -356,10 +346,13 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
356
346
|
expect(described_class).to receive(:pkg)
|
357
347
|
.with(:list, '-Hvfa', 'dummy@1.0-0.151006')
|
358
348
|
.and_return(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_implicit_version')), 0))
|
359
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
349
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
350
|
+
.with(['/bin/pkg', 'install', '-n', 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
|
351
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
360
352
|
expect(provider).to receive(:unhold).with(no_args)
|
361
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
362
|
-
|
353
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
354
|
+
.with(['/bin/pkg', 'install', *hash[:flags], 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
|
355
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
363
356
|
provider.insync?(is)
|
364
357
|
provider.install
|
365
358
|
end
|
@@ -370,10 +363,13 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
370
363
|
expect(provider).to receive(:query).with(no_args).and_return({:ensure => is})
|
371
364
|
expect(provider).to receive(:properties).and_return({:mark => :hold})
|
372
365
|
expect(described_class).to receive(:pkg).with(:list, '-Hvfa', 'dummy@1.0-0.151006').and_return(File.read(my_fixture('dummy_implicit_version')))
|
373
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
366
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
367
|
+
.with(['/bin/pkg', 'update', '-n', 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
|
368
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
374
369
|
expect(provider).to receive(:unhold).with(no_args)
|
375
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
376
|
-
|
370
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
371
|
+
.with(['/bin/pkg', 'update', *hash[:flags], 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
|
372
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
377
373
|
provider.insync?(is)
|
378
374
|
provider.install
|
379
375
|
end
|
@@ -385,8 +381,9 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
385
381
|
expect(described_class).to receive(:pkg)
|
386
382
|
.with(:list, '-Hvfa', 'dummy@1.0-0.151006')
|
387
383
|
.and_return(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_implicit_version')), 0))
|
388
|
-
expect(Puppet::Util::Execution).to receive(:execute)
|
389
|
-
|
384
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
385
|
+
.with(['/bin/pkg', 'update', '-n', 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
|
386
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 4))
|
390
387
|
provider.insync?(is)
|
391
388
|
end
|
392
389
|
|
@@ -395,9 +392,12 @@ describe Puppet::Type.type(:package).provider(:pkg), unless: Puppet::Util::Platf
|
|
395
392
|
is = :absent
|
396
393
|
expect(provider).to receive(:warning).with("Implicit version 1.0-0.151006 has 3 possible matches")
|
397
394
|
expect(provider).to receive(:warning).with("Selecting version '1.0,5.11-0.151006:20140220T084443Z' for implicit '1.0-0.151006'")
|
398
|
-
expect(described_class).to receive(:pkg)
|
399
|
-
|
400
|
-
|
395
|
+
expect(described_class).to receive(:pkg)
|
396
|
+
.with(:list, '-Hvfa', 'dummy@1.0-0.151006')
|
397
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new(File.read(my_fixture('dummy_implicit_version')), 0))
|
398
|
+
expect(Puppet::Util::Execution).to receive(:execute)
|
399
|
+
.with(['/bin/pkg', 'install', '-n', 'dummy@1.0,5.11-0.151006:20140220T084443Z'], {:failonfail => false, :combine => true})
|
400
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
401
401
|
provider.insync?(is)
|
402
402
|
end
|
403
403
|
end
|
@@ -31,6 +31,34 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
|
|
31
31
|
allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
|
32
32
|
end
|
33
33
|
|
34
|
+
|
35
|
+
describe '.windows_gemcmd' do
|
36
|
+
context 'when PUPPET_DIR is not set' do
|
37
|
+
before do
|
38
|
+
allow(Puppet::Util).to receive(:get_env).and_call_original
|
39
|
+
allow(Puppet::Util).to receive(:get_env).with('PUPPET_DIR').and_return(nil)
|
40
|
+
allow(Gem).to receive(:default_bindir).and_return('default_gem_bin')
|
41
|
+
end
|
42
|
+
|
43
|
+
it 'uses Gem.default_bindir' do
|
44
|
+
expected_path = File.join('default_gem_bin', 'gem.bat')
|
45
|
+
expect(described_class.windows_gemcmd).to eql(expected_path)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
context 'when PUPPET_DIR is set' do
|
50
|
+
before do
|
51
|
+
allow(Puppet::Util).to receive(:get_env).and_call_original
|
52
|
+
allow(Puppet::Util).to receive(:get_env).with('PUPPET_DIR').and_return('puppet_dir')
|
53
|
+
end
|
54
|
+
|
55
|
+
it 'uses Gem.default_bindir' do
|
56
|
+
expected_path = File.join('puppet_dir', 'bin', 'gem.bat')
|
57
|
+
expect(described_class.windows_gemcmd).to eql(expected_path)
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
34
62
|
context "when installing" do
|
35
63
|
before :each do
|
36
64
|
allow(provider).to receive(:rubygem_version).and_return('1.9.9')
|
@@ -82,13 +110,15 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
|
|
82
110
|
end
|
83
111
|
|
84
112
|
context 'calculated specificity' do
|
113
|
+
include_context 'provider specificity'
|
114
|
+
|
85
115
|
context 'when is not defaultfor' do
|
86
116
|
subject { described_class.specificity }
|
87
117
|
it { is_expected.to eql 1 }
|
88
118
|
end
|
89
119
|
|
90
120
|
context 'when is defaultfor' do
|
91
|
-
let(:os) {
|
121
|
+
let(:os) { Facter.value(:operatingsystem) }
|
92
122
|
subject do
|
93
123
|
described_class.defaultfor(operatingsystem: os)
|
94
124
|
described_class.specificity
|
@@ -119,6 +119,8 @@ describe Puppet::Type.type(:package).provider(:puppetserver_gem) do
|
|
119
119
|
end
|
120
120
|
|
121
121
|
context 'calculated specificity' do
|
122
|
+
include_context 'provider specificity'
|
123
|
+
|
122
124
|
context 'when is not defaultfor' do
|
123
125
|
subject { described_class.specificity }
|
124
126
|
it { is_expected.to eql 1 }
|
@@ -14,10 +14,6 @@ describe "base service provider" do
|
|
14
14
|
|
15
15
|
subject { provider }
|
16
16
|
|
17
|
-
before(:all) do
|
18
|
-
`exit 0`
|
19
|
-
end
|
20
|
-
|
21
17
|
context "basic operations" do
|
22
18
|
subject do
|
23
19
|
type.new(
|
@@ -35,16 +31,19 @@ describe "base service provider" do
|
|
35
31
|
expect(options[:failonfail]).to eq(true)
|
36
32
|
raise(Puppet::ExecutionFailure, 'failed to start') if @running
|
37
33
|
@running = true
|
38
|
-
|
34
|
+
Puppet::Util::Execution::ProcessOutput.new('started', 0)
|
39
35
|
when status_command
|
40
36
|
expect(options[:failonfail]).to eq(false)
|
41
|
-
|
42
|
-
|
37
|
+
if @running
|
38
|
+
Puppet::Util::Execution::ProcessOutput.new('running', 0)
|
39
|
+
else
|
40
|
+
Puppet::Util::Execution::ProcessOutput.new('not running', 1)
|
41
|
+
end
|
43
42
|
when stop_command
|
44
43
|
expect(options[:failonfail]).to eq(true)
|
45
44
|
raise(Puppet::ExecutionFailure, 'failed to stop') unless @running
|
46
45
|
@running = false
|
47
|
-
|
46
|
+
Puppet::Util::Execution::ProcessOutput.new('stopped', 0)
|
48
47
|
else
|
49
48
|
raise "unexpected command execution: #{command}"
|
50
49
|
end
|
@@ -98,6 +97,7 @@ describe "base service provider" do
|
|
98
97
|
end
|
99
98
|
|
100
99
|
it "retrieves a PID from the process table" do
|
100
|
+
allow(Facter).to receive(:value).and_call_original
|
101
101
|
allow(Facter).to receive(:value).with(:operatingsystem).and_return("CentOS")
|
102
102
|
ps_output = File.binread(my_fixture("ps_ef.mixed_encoding")).force_encoding(Encoding::UTF_8)
|
103
103
|
|
@@ -4,10 +4,6 @@ describe 'Puppet::Type::Service::Provider::Bsd',
|
|
4
4
|
unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
|
5
5
|
let(:provider_class) { Puppet::Type.type(:service).provider(:bsd) }
|
6
6
|
|
7
|
-
before(:all) do
|
8
|
-
`exit 0`
|
9
|
-
end
|
10
|
-
|
11
7
|
before :each do
|
12
8
|
allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
|
13
9
|
allow(Facter).to receive(:value).with(:operatingsystem).and_return(:netbsd)
|
@@ -109,7 +109,7 @@ describe 'Puppet::Type::Service::Provider::Daemontools',
|
|
109
109
|
path = File.join(@servicedir,"myservice")
|
110
110
|
expect(Puppet::FileSystem).to receive(:symlink?).with(path).and_return(true)
|
111
111
|
expect(Puppet::FileSystem).to receive(:unlink).with(path)
|
112
|
-
allow(@provider).to receive(:
|
112
|
+
allow(@provider).to receive(:execute).and_return("")
|
113
113
|
@provider.disable
|
114
114
|
end
|
115
115
|
|
@@ -4,10 +4,6 @@ describe 'Puppet::Type::Service::Provider::Debian',
|
|
4
4
|
unless: Puppet::Util::Platform.jruby? || Puppet::Util::Platform.windows? do
|
5
5
|
let(:provider_class) { Puppet::Type.type(:service).provider(:debian) }
|
6
6
|
|
7
|
-
before(:all) do
|
8
|
-
`exit 0`
|
9
|
-
end
|
10
|
-
|
11
7
|
before(:each) do
|
12
8
|
# Create a mock resource
|
13
9
|
@resource = double('resource')
|
@@ -90,34 +86,37 @@ describe 'Puppet::Type::Service::Provider::Debian',
|
|
90
86
|
end
|
91
87
|
|
92
88
|
context "when checking whether it is enabled" do
|
93
|
-
it "should
|
94
|
-
expect(@provider).to receive(:
|
95
|
-
|
89
|
+
it "should execute the query command" do
|
90
|
+
expect(@provider).to receive(:execute).with(["/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start"], :failonfail => false)
|
91
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
|
96
92
|
@provider.enabled?
|
97
93
|
end
|
98
94
|
|
99
95
|
it "should return true when invoke-rc.d exits with 104 status" do
|
100
|
-
|
101
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(104)
|
96
|
+
expect(@provider).to receive(:execute).and_return(Puppet::Util::Execution::ProcessOutput.new('', 104))
|
102
97
|
expect(@provider.enabled?).to eq(:true)
|
103
98
|
end
|
104
99
|
|
105
100
|
it "should return true when invoke-rc.d exits with 106 status" do
|
106
|
-
|
107
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(106)
|
101
|
+
expect(@provider).to receive(:execute).and_return(Puppet::Util::Execution::ProcessOutput.new('', 106))
|
108
102
|
expect(@provider.enabled?).to eq(:true)
|
109
103
|
end
|
110
104
|
|
105
|
+
it "should consider nonexistent services to be disabled" do
|
106
|
+
@provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'doesnotexist'))
|
107
|
+
expect(@provider).to receive(:execute).with(["/usr/sbin/invoke-rc.d", "--quiet", "--query", "doesnotexist", "start"], :failonfail => false)
|
108
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new("", 1))
|
109
|
+
expect(@provider.enabled?).to be(:false)
|
110
|
+
end
|
111
|
+
|
111
112
|
shared_examples "manually queries service status" do |status|
|
112
113
|
it "links count is 4" do
|
113
|
-
allow(@provider).to receive(:
|
114
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(status)
|
114
|
+
allow(@provider).to receive(:execute).and_return(Puppet::Util::Execution::ProcessOutput.new('', status))
|
115
115
|
allow(@provider).to receive(:get_start_link_count).and_return(4)
|
116
116
|
expect(@provider.enabled?).to eq(:true)
|
117
117
|
end
|
118
118
|
it "links count is less than 4" do
|
119
|
-
allow(@provider).to receive(:
|
120
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(status)
|
119
|
+
allow(@provider).to receive(:execute).and_return(Puppet::Util::Execution::ProcessOutput.new('', status))
|
121
120
|
allow(@provider).to receive(:get_start_link_count).and_return(3)
|
122
121
|
expect(@provider.enabled?).to eq(:false)
|
123
122
|
end
|
@@ -142,8 +141,7 @@ describe 'Puppet::Type::Service::Provider::Debian',
|
|
142
141
|
# pick a range of non-[104.106] numbers, strings and booleans to test with.
|
143
142
|
[-100, -1, 0, 1, 100, "foo", "", :true, :false].each do |exitstatus|
|
144
143
|
it "should return false when invoke-rc.d exits with #{exitstatus} status" do
|
145
|
-
allow(@provider).to receive(:
|
146
|
-
allow($CHILD_STATUS).to receive(:exitstatus).and_return(exitstatus)
|
144
|
+
allow(@provider).to receive(:execute).and_return(Puppet::Util::Execution::ProcessOutput.new('', exitstatus))
|
147
145
|
expect(@provider.enabled?).to eq(:false)
|
148
146
|
end
|
149
147
|
end
|
@@ -4,10 +4,6 @@ describe 'Puppet::Type::Service::Provider::Gentoo',
|
|
4
4
|
unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
|
5
5
|
let(:provider_class) { Puppet::Type.type(:service).provider(:gentoo) }
|
6
6
|
|
7
|
-
before(:all) do
|
8
|
-
`exit 0`
|
9
|
-
end
|
10
|
-
|
11
7
|
before :each do
|
12
8
|
allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
|
13
9
|
allow(FileTest).to receive(:file?).with('/sbin/rc-update').and_return(true)
|
@@ -46,6 +42,10 @@ describe 'Puppet::Type::Service::Provider::Gentoo',
|
|
46
42
|
]
|
47
43
|
end
|
48
44
|
|
45
|
+
let :process_output do
|
46
|
+
Puppet::Util::Execution::ProcessOutput.new('', 0)
|
47
|
+
end
|
48
|
+
|
49
49
|
describe ".instances" do
|
50
50
|
it "should have an instances method" do
|
51
51
|
expect(provider_class).to respond_to(:instances)
|
@@ -160,24 +160,27 @@ describe 'Puppet::Type::Service::Provider::Gentoo',
|
|
160
160
|
it "should use the status command from the resource" do
|
161
161
|
provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
|
162
162
|
expect(provider).not_to receive(:execute).with(['/etc/init.d/sshd',:status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
163
|
-
expect(provider).to receive(:execute)
|
164
|
-
|
163
|
+
expect(provider).to receive(:execute)
|
164
|
+
.with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
165
|
+
.and_return(process_output)
|
165
166
|
provider.status
|
166
167
|
end
|
167
168
|
|
168
169
|
it "should return :stopped when the status command returns with a non-zero exitcode" do
|
169
170
|
provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
|
170
171
|
expect(provider).not_to receive(:execute).with(['/etc/init.d/sshd',:status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
171
|
-
expect(provider).to receive(:execute)
|
172
|
-
|
172
|
+
expect(provider).to receive(:execute)
|
173
|
+
.with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
174
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 3))
|
173
175
|
expect(provider.status).to eq(:stopped)
|
174
176
|
end
|
175
177
|
|
176
178
|
it "should return :running when the status command returns with a zero exitcode" do
|
177
179
|
provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :status => '/bin/foo'))
|
178
180
|
expect(provider).not_to receive(:execute).with(['/etc/init.d/sshd',:status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
179
|
-
expect(provider).to receive(:execute)
|
180
|
-
|
181
|
+
expect(provider).to receive(:execute)
|
182
|
+
.with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
183
|
+
.and_return(process_output)
|
181
184
|
expect(provider.status).to eq(:running)
|
182
185
|
end
|
183
186
|
end
|
@@ -202,16 +205,18 @@ describe 'Puppet::Type::Service::Provider::Gentoo',
|
|
202
205
|
it "should return running if <initscript> status exits with a zero exitcode" do
|
203
206
|
provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :hasstatus => true))
|
204
207
|
expect(provider).to receive(:search).with('sshd').and_return('/etc/init.d/sshd')
|
205
|
-
expect(provider).to receive(:execute)
|
206
|
-
|
208
|
+
expect(provider).to receive(:execute)
|
209
|
+
.with(['/etc/init.d/sshd',:status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
210
|
+
.and_return(process_output)
|
207
211
|
expect(provider.status).to eq(:running)
|
208
212
|
end
|
209
213
|
|
210
214
|
it "should return stopped if <initscript> status exits with a non-zero exitcode" do
|
211
215
|
provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :hasstatus => true))
|
212
216
|
expect(provider).to receive(:search).with('sshd').and_return('/etc/init.d/sshd')
|
213
|
-
expect(provider).to receive(:execute)
|
214
|
-
|
217
|
+
expect(provider).to receive(:execute)
|
218
|
+
.with(['/etc/init.d/sshd',:status], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
|
219
|
+
.and_return(Puppet::Util::Execution::ProcessOutput.new('', 3))
|
215
220
|
expect(provider.status).to eq(:stopped)
|
216
221
|
end
|
217
222
|
end
|